diff --git a/app/Config/Services.php b/app/Config/Services.php
index f98dc979..668e31bd 100755
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -3,7 +3,7 @@
 namespace Config;
 
 use App\Services\EmailService;
-use App\Services\SemesterScoreService;
+use App\Services\Scores\SemesterScoreService;
 
 class Services
 {
diff --git a/app/Http/Controllers/Api/Api.zip b/app/Http/Controllers/Api/Api.zip
deleted file mode 100644
index fbcb1390..00000000
Binary files a/app/Http/Controllers/Api/Api.zip and /dev/null differ
diff --git a/app/Http/Controllers/Api/AttendanceTracking/AttendanceTrackingController.php b/app/Http/Controllers/Api/AttendanceTracking/AttendanceTrackingController.php
index 7348d6ea..bdb79f31 100644
--- a/app/Http/Controllers/Api/AttendanceTracking/AttendanceTrackingController.php
+++ b/app/Http/Controllers/Api/AttendanceTracking/AttendanceTrackingController.php
@@ -8,7 +8,7 @@ use App\Http\Requests\AttendanceTracking\ParentsInfoRequest;
 use App\Http\Requests\AttendanceTracking\RecordAttendanceTrackingRequest;
 use App\Http\Requests\AttendanceTracking\SaveAttendanceNotificationNoteRequest;
 use App\Http\Requests\AttendanceTracking\SendAttendanceManualEmailRequest;
-use App\Services\AttendanceTrackingService;
+use App\Services\AttendanceTracking\AttendanceTrackingService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Api/Auth/RegisterController.php b/app/Http/Controllers/Api/Auth/RegisterController.php
new file mode 100644
index 00000000..5ec3221e
--- /dev/null
+++ b/app/Http/Controllers/Api/Auth/RegisterController.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Controllers\Api\Auth;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Auth\RegisterRequest;
+use App\Http\Resources\Auth\RegisterResource;
+use App\Services\Auth\RegistrationCaptchaService;
+use App\Services\Auth\RegistrationService;
+use Illuminate\Http\JsonResponse;
+
+class RegisterController extends BaseApiController
+{
+    public function __construct(
+        private RegistrationService $service,
+        private RegistrationCaptchaService $captchaService
+    ) {
+        parent::__construct();
+    }
+
+    public function captcha(): JsonResponse
+    {
+        $captcha = $this->captchaService->generate();
+
+        return response()->json([
+            'ok' => true,
+            'captcha' => $captcha,
+        ]);
+    }
+
+    public function store(RegisterRequest $request): JsonResponse
+    {
+        if (app()->runningUnitTests() && $request->header('X-Debug-Request') === '1') {
+            return response()->json([
+                'ok' => true,
+                'debug' => [
+                    'content_type' => $request->header('Content-Type'),
+                    'content_length' => strlen((string) $request->getContent()),
+                    'request_all' => $request->all(),
+                    'json_all' => $request->json()->all(),
+                    'payload_data' => $this->payloadData(),
+                ],
+            ]);
+        }
+
+        $result = $this->service->register($request->validated());
+
+        if (empty($result['ok'])) {
+            $code = $result['code'] ?? 'registration_failed';
+            $status = $code === 'pending_activation' || $code === 'email_exists' ? 409 : 422;
+
+            return response()->json([
+                'ok' => false,
+                'message' => $result['message'] ?? 'Registration failed.',
+                'code' => $code,
+            ], $status);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'registration' => new RegisterResource($result),
+        ], 201);
+    }
+}
diff --git a/app/Http/Controllers/Api/ClassPrep/ClassPrepController.php b/app/Http/Controllers/Api/ClassPrep/ClassPrepController.php
new file mode 100644
index 00000000..003c13a6
--- /dev/null
+++ b/app/Http/Controllers/Api/ClassPrep/ClassPrepController.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Controllers\Api\ClassPrep;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Services\ClassPrep\ClassRosterService;
+use App\Services\ClassPrep\StickerCountService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ClassPrepController extends BaseApiController
+{
+    private StickerCountService $stickerCounts;
+    private ClassRosterService $roster;
+
+    public function __construct(StickerCountService $stickerCounts, ClassRosterService $roster)
+    {
+        parent::__construct();
+        $this->stickerCounts = $stickerCounts;
+        $this->roster = $roster;
+    }
+
+    public function stickerCounts(Request $request): JsonResponse
+    {
+        $schoolYear = (string) ($request->query('school_year') ?? '');
+        $semester = (string) ($request->query('semester') ?? '');
+        $classSectionId = $request->query('class_section_id') ?? $request->query('class_id');
+        $classSectionId = is_numeric($classSectionId) ? (int) $classSectionId : null;
+
+        if ($classSectionId !== null && $classSectionId > 0) {
+            $payload = $this->stickerCounts->listForClass($schoolYear, $semester, $classSectionId);
+        } else {
+            $payload = $this->stickerCounts->listAll($schoolYear, $semester);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'data' => $payload,
+        ]);
+    }
+
+    public function studentsByClass(Request $request, int $classSectionId): JsonResponse
+    {
+        $schoolYear = (string) ($request->query('school_year') ?? '');
+
+        $students = $this->roster->listStudentsByClass($classSectionId, $schoolYear !== '' ? $schoolYear : null);
+
+        return response()->json([
+            'ok' => true,
+            'students' => $students,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/ClassPreparation/ClassPreparationController.php b/app/Http/Controllers/Api/ClassPreparation/ClassPreparationController.php
new file mode 100644
index 00000000..584ff75d
--- /dev/null
+++ b/app/Http/Controllers/Api/ClassPreparation/ClassPreparationController.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\Api\ClassPreparation;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Services\ClassPreparation\ClassPreparationService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ClassPreparationController extends BaseApiController
+{
+    private ClassPreparationService $service;
+
+    public function __construct(ClassPreparationService $service)
+    {
+        parent::__construct();
+        $this->service = $service;
+    }
+
+    public function index(Request $request): JsonResponse
+    {
+        $schoolYear = (string) ($request->query('school_year') ?? '');
+        $semester = (string) ($request->query('semester') ?? '');
+
+        $payload = $this->service->listPrep(
+            $schoolYear !== '' ? $schoolYear : null,
+            $semester !== '' ? $semester : null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'schoolYear' => $payload['schoolYear'],
+            'semester' => $payload['semester'],
+            'results' => $payload['results'],
+            'totals' => $payload['totals'],
+            'shortages' => $payload['shortages'],
+        ]);
+    }
+
+    public function markPrinted(Request $request): JsonResponse
+    {
+        $schoolYear = (string) ($request->input('school_year') ?? '');
+        $semester = (string) ($request->input('semester') ?? '');
+        $ids = $request->input('class_section_ids', []);
+
+        if ($schoolYear === '' || !is_array($ids)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'school_year and class_section_ids are required.',
+            ], 422);
+        }
+
+        $count = $this->service->markPrinted($schoolYear, $semester, $ids);
+
+        return response()->json([
+            'ok' => true,
+            'updated' => $count,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Communication/CommunicationController.php b/app/Http/Controllers/Api/Communication/CommunicationController.php
new file mode 100644
index 00000000..74300f85
--- /dev/null
+++ b/app/Http/Controllers/Api/Communication/CommunicationController.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace App\Http\Controllers\Api\Communication;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Services\Communication\CommunicationFamilyService;
+use App\Services\Communication\CommunicationPreviewService;
+use App\Services\Communication\CommunicationSendService;
+use App\Services\Communication\CommunicationStudentService;
+use App\Services\Communication\CommunicationTemplateService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CommunicationController extends BaseApiController
+{
+    private CommunicationStudentService $students;
+    private CommunicationTemplateService $templates;
+    private CommunicationFamilyService $families;
+    private CommunicationPreviewService $previewService;
+    private CommunicationSendService $sendService;
+
+    public function __construct(
+        CommunicationStudentService $students,
+        CommunicationTemplateService $templates,
+        CommunicationFamilyService $families,
+        CommunicationPreviewService $previewService,
+        CommunicationSendService $sendService
+    ) {
+        parent::__construct();
+        $this->students = $students;
+        $this->templates = $templates;
+        $this->families = $families;
+        $this->previewService = $previewService;
+        $this->sendService = $sendService;
+    }
+
+    public function options(): JsonResponse
+    {
+        return response()->json([
+            'ok' => true,
+            'students' => $this->students->listStudents(),
+            'templates' => $this->templates->listActiveTemplates(),
+        ]);
+    }
+
+    public function families(int $studentId): JsonResponse
+    {
+        return response()->json([
+            'ok' => true,
+            'data' => $this->families->familiesForStudent($studentId),
+        ]);
+    }
+
+    public function guardians(int $familyId): JsonResponse
+    {
+        return response()->json([
+            'ok' => true,
+            'data' => $this->families->guardiansForFamily($familyId),
+        ]);
+    }
+
+    public function preview(Request $request): JsonResponse
+    {
+        $templateKey = (string) $request->input('template_key', '');
+        $studentId = (int) $request->input('student_id', 0);
+        $familyId = (int) $request->input('family_id', 0);
+        $vars = $this->normalizeArray($request->input('vars', []));
+
+        if ($templateKey === '' || $studentId <= 0 || $familyId <= 0) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'template_key, student_id, and family_id are required.',
+            ], 422);
+        }
+
+        $teacherName = $this->resolveTeacherName();
+        $result = $this->previewService->buildPreview($templateKey, $studentId, $familyId, $vars, $teacherName);
+
+        if (!$result['ok']) {
+            return response()->json([
+                'ok' => false,
+                'message' => $result['message'] ?? 'Preview failed.',
+            ], $result['status'] ?? 400);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'subject' => $result['subject'],
+            'html' => $result['html'],
+        ]);
+    }
+
+    public function send(Request $request): JsonResponse
+    {
+        $studentId = (int) $request->input('student_id', 0);
+        $familyId = (int) $request->input('family_id', 0);
+        $templateKey = (string) $request->input('template_key', '');
+        $subject = (string) $request->input('subject', '');
+        $body = (string) $request->input('body', '');
+        $recipients = $this->normalizeArray($request->input('recipients', []));
+        $cc = $this->normalizeArray($request->input('cc', []));
+        $bcc = $this->normalizeArray($request->input('bcc', []));
+
+        if ($studentId <= 0 || $familyId <= 0 || $templateKey === '' || $subject === '' || $body === '') {
+            return response()->json([
+                'ok' => false,
+                'message' => 'student_id, family_id, template_key, subject, and body are required.',
+            ], 422);
+        }
+
+        if (empty($recipients)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'At least one recipient is required.',
+            ], 422);
+        }
+
+        $student = $this->students->getStudentBasic($studentId);
+        if (!$student) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Student not found.',
+            ], 404);
+        }
+
+        $result = $this->sendService->send([
+            'student_id' => $studentId,
+            'family_id' => $familyId,
+            'template_key' => $templateKey,
+            'subject' => $subject,
+            'body' => $body,
+            'recipients' => $recipients,
+            'cc' => $cc,
+            'bcc' => $bcc,
+            'student_name' => trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? '')),
+            'sent_by' => (int) (auth()->id() ?? 0),
+        ]);
+
+        if (!$result['ok']) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Failed to send email.',
+                'error' => $result['error'],
+            ], 500);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'message' => 'Email sent successfully.',
+        ]);
+    }
+
+    private function normalizeArray($value): array
+    {
+        if (is_array($value)) {
+            return $value;
+        }
+
+        if (is_string($value) && $value !== '') {
+            $decoded = json_decode($value, true);
+            if (is_array($decoded)) {
+                return $decoded;
+            }
+        }
+
+        return [];
+    }
+
+    private function resolveTeacherName(): string
+    {
+        $user = auth()->user();
+        if ($user) {
+            $name = trim(($user->firstname ?? '') . ' ' . ($user->lastname ?? ''));
+            return $name !== '' ? $name : 'Teacher';
+        }
+        return 'Teacher';
+    }
+}
diff --git a/app/Http/Controllers/Api/CompetitionScores/CompetitionScoresController.php b/app/Http/Controllers/Api/CompetitionScores/CompetitionScoresController.php
new file mode 100644
index 00000000..52b96100
--- /dev/null
+++ b/app/Http/Controllers/Api/CompetitionScores/CompetitionScoresController.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace App\Http\Controllers\Api\CompetitionScores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Models\Competition;
+use App\Services\CompetitionScores\CompetitionScoresContextService;
+use App\Services\CompetitionScores\CompetitionScoresQueryService;
+use App\Services\CompetitionScores\CompetitionScoresRosterService;
+use App\Services\CompetitionScores\CompetitionScoresSaveService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CompetitionScoresController extends BaseApiController
+{
+    private CompetitionScoresContextService $contextService;
+    private CompetitionScoresQueryService $queryService;
+    private CompetitionScoresRosterService $rosterService;
+    private CompetitionScoresSaveService $saveService;
+
+    public function __construct(
+        CompetitionScoresContextService $contextService,
+        CompetitionScoresQueryService $queryService,
+        CompetitionScoresRosterService $rosterService,
+        CompetitionScoresSaveService $saveService
+    ) {
+        parent::__construct();
+        $this->contextService = $contextService;
+        $this->queryService = $queryService;
+        $this->rosterService = $rosterService;
+        $this->saveService = $saveService;
+    }
+
+    public function index(Request $request): JsonResponse
+    {
+        $userId = (int) (auth()->id() ?? 0);
+        [$assignments, $schoolYear, $semester] = $this->contextService->getTeacherContext($userId);
+
+        $activeClassId = $this->contextService->resolveActiveClassId(
+            $assignments,
+            (int) $request->query('class_section_id', 0)
+        );
+        $activeClassName = $this->contextService->getActiveClassName($assignments, $activeClassId);
+
+        if (empty($assignments) || $activeClassId <= 0) {
+            return response()->json([
+                'ok' => true,
+                'competitions' => [],
+                'activeClassId' => $activeClassId,
+                'activeClassName' => $activeClassName,
+                'questionCounts' => [],
+                'scoreCounts' => [],
+                'studentTotal' => 0,
+                'sectionMap' => $this->contextService->getClassSectionMap(),
+                'schoolYear' => $schoolYear,
+                'semester' => $semester,
+                'hasClasses' => false,
+            ]);
+        }
+
+        $competitions = $this->queryService->getCompetitionsForClass($activeClassId, $schoolYear, $semester);
+        $competitionIds = array_values(array_filter(array_map(static function ($row) {
+            return (int) ($row['id'] ?? 0);
+        }, $competitions)));
+
+        return response()->json([
+            'ok' => true,
+            'competitions' => $competitions,
+            'activeClassId' => $activeClassId,
+            'activeClassName' => $activeClassName,
+            'questionCounts' => $this->queryService->getQuestionCounts($competitionIds, $activeClassId),
+            'scoreCounts' => $this->queryService->getScoreCounts($competitionIds, $activeClassId),
+            'studentTotal' => $this->rosterService->getClassStudentCount($activeClassId, $schoolYear),
+            'sectionMap' => $this->contextService->getClassSectionMap(),
+            'schoolYear' => $schoolYear,
+            'semester' => $semester,
+            'hasClasses' => true,
+        ]);
+    }
+
+    public function edit(Request $request, int $id): JsonResponse
+    {
+        $userId = (int) (auth()->id() ?? 0);
+        [$assignments, $schoolYear, $semester] = $this->contextService->getTeacherContext($userId);
+        $allowedClassIds = $this->contextService->getAllowedClassIds($assignments);
+
+        if (empty($allowedClassIds)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'No class assignments found for your account.',
+            ], 403);
+        }
+
+        $competition = Competition::query()->find($id);
+        if (!$competition) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Competition not found.',
+            ], 404);
+        }
+
+        $isLocked = (bool) $competition->is_locked;
+        $lockedClassId = (int) ($competition->class_section_id ?? 0);
+        $requestedClassId = (int) $request->query('class_section_id', 0);
+        $activeClassId = $this->contextService->resolveActiveClassId($assignments, $requestedClassId);
+        $classSectionId = $lockedClassId > 0 ? $lockedClassId : $activeClassId;
+
+        if ($classSectionId <= 0) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Select a class section before entering scores.',
+            ], 422);
+        }
+
+        if (!in_array($classSectionId, $allowedClassIds, true)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'You are not assigned to that class.',
+            ], 403);
+        }
+
+        $competitionArray = $competition->toArray();
+        $students = $this->rosterService->getStudentsForCompetition($competitionArray, $classSectionId);
+        $scoreMap = $this->saveService->getScoreMap($id, $classSectionId);
+        $questionCount = $this->queryService->getQuestionCountForCompetition($id, $classSectionId);
+        $classStudentCount = $this->rosterService->getClassStudentCount(
+            $classSectionId,
+            $competitionArray['school_year'] ?? $schoolYear
+        );
+
+        return response()->json([
+            'ok' => true,
+            'competition' => $competitionArray,
+            'students' => $students,
+            'scoreMap' => $scoreMap,
+            'classSectionId' => $classSectionId,
+            'classSectionName' => $this->contextService->getActiveClassName($assignments, $classSectionId),
+            'classStudentCount' => $classStudentCount,
+            'questionCount' => $questionCount,
+            'classSelectionLocked' => $lockedClassId > 0,
+            'isLocked' => $isLocked,
+            'schoolYear' => $schoolYear,
+            'semester' => $semester,
+        ]);
+    }
+
+    public function save(Request $request, int $id): JsonResponse
+    {
+        $userId = (int) (auth()->id() ?? 0);
+        [$assignments] = $this->contextService->getTeacherContext($userId);
+        $allowedClassIds = $this->contextService->getAllowedClassIds($assignments);
+
+        if (empty($allowedClassIds)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'No class assignments found for your account.',
+            ], 403);
+        }
+
+        $competition = Competition::query()->find($id);
+        if (!$competition) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Competition not found.',
+            ], 404);
+        }
+
+        if ((bool) $competition->is_locked) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Competition is locked. You cannot update scores.',
+            ], 423);
+        }
+
+        $lockedClassId = (int) ($competition->class_section_id ?? 0);
+        $classSectionId = $lockedClassId > 0 ? $lockedClassId : (int) $request->input('class_section_id', 0);
+
+        if ($classSectionId <= 0) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Select a class section before saving scores.',
+            ], 422);
+        }
+
+        if (!in_array($classSectionId, $allowedClassIds, true)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'You are not assigned to that class.',
+            ], 403);
+        }
+
+        $scores = $request->input('scores', []);
+        $scores = is_array($scores) ? $scores : [];
+        [$cleanScores, $invalidScores] = $this->saveService->filterScores($scores);
+
+        if (!empty($invalidScores)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Scores must be whole numbers (no decimals).',
+                'invalidScores' => $invalidScores,
+            ], 422);
+        }
+
+        $this->saveService->saveScores($id, $classSectionId, $cleanScores);
+
+        return response()->json([
+            'ok' => true,
+            'message' => 'Scores saved.',
+            'savedCount' => count($cleanScores),
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Discounts/DiscountController.php b/app/Http/Controllers/Api/Discounts/DiscountController.php
new file mode 100644
index 00000000..d7885a8d
--- /dev/null
+++ b/app/Http/Controllers/Api/Discounts/DiscountController.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers\Api\Discounts;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Discounts\ApplyDiscountVoucherRequest;
+use App\Http\Requests\Discounts\StoreDiscountVoucherRequest;
+use App\Http\Requests\Discounts\UpdateDiscountVoucherRequest;
+use App\Http\Resources\Discounts\DiscountParentResource;
+use App\Http\Resources\Discounts\DiscountVoucherResource;
+use App\Services\Discounts\DiscountApplyService;
+use App\Services\Discounts\DiscountContextService;
+use App\Services\Discounts\DiscountParentService;
+use App\Services\Discounts\DiscountVoucherService;
+use Illuminate\Http\JsonResponse;
+
+class DiscountController extends BaseApiController
+{
+    private DiscountContextService $context;
+    private DiscountVoucherService $voucherService;
+    private DiscountParentService $parentService;
+    private DiscountApplyService $applyService;
+
+    public function __construct(
+        DiscountContextService $context,
+        DiscountVoucherService $voucherService,
+        DiscountParentService $parentService,
+        DiscountApplyService $applyService
+    ) {
+        parent::__construct();
+        $this->context = $context;
+        $this->voucherService = $voucherService;
+        $this->parentService = $parentService;
+        $this->applyService = $applyService;
+    }
+
+    public function options(): JsonResponse
+    {
+        $schoolYear = $this->context->getSchoolYear();
+        $vouchers = $this->voucherService->listActive();
+        $parents = $this->parentService->listParentsWithDiscounts($schoolYear);
+
+        return response()->json([
+            'ok' => true,
+            'vouchers' => DiscountVoucherResource::collection($vouchers),
+            'parents' => DiscountParentResource::collection($parents),
+            'schoolYear' => $schoolYear,
+        ]);
+    }
+
+    public function apply(ApplyDiscountVoucherRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->applyService->applyVoucher(
+            (int) $payload['voucher_id'],
+            $payload['parent_ids'],
+            (bool) ($payload['allow_additional'] ?? false),
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json($result, $result['ok'] ? 200 : 422);
+    }
+
+    public function listVouchers(): JsonResponse
+    {
+        $vouchers = $this->voucherService->listAll();
+        return response()->json([
+            'ok' => true,
+            'vouchers' => DiscountVoucherResource::collection($vouchers),
+        ]);
+    }
+
+    public function storeVoucher(StoreDiscountVoucherRequest $request): JsonResponse
+    {
+        $voucher = $this->voucherService->create($request->validated());
+        return response()->json([
+            'ok' => true,
+            'voucher' => new DiscountVoucherResource($voucher),
+        ], 201);
+    }
+
+    public function updateVoucher(UpdateDiscountVoucherRequest $request, int $id): JsonResponse
+    {
+        $voucher = $this->voucherService->update($id, $request->validated());
+        return response()->json([
+            'ok' => true,
+            'voucher' => new DiscountVoucherResource($voucher),
+        ]);
+    }
+
+    public function showVoucher(int $id): JsonResponse
+    {
+        $voucher = $this->voucherService->find($id);
+        return response()->json([
+            'ok' => true,
+            'voucher' => new DiscountVoucherResource($voucher),
+        ]);
+    }
+
+    public function deleteVoucher(int $id): JsonResponse
+    {
+        $this->voucherService->delete($id);
+        return response()->json([
+            'ok' => true,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Email/BroadcastEmailController.php b/app/Http/Controllers/Api/Email/BroadcastEmailController.php
new file mode 100644
index 00000000..16fd3d93
--- /dev/null
+++ b/app/Http/Controllers/Api/Email/BroadcastEmailController.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace App\Http\Controllers\Api\Email;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Services\BroadcastEmail\BroadcastEmailComposerService;
+use App\Services\BroadcastEmail\BroadcastEmailDispatchService;
+use App\Services\BroadcastEmail\BroadcastEmailImageService;
+use App\Services\BroadcastEmail\BroadcastEmailRecipientService;
+use App\Services\BroadcastEmail\BroadcastEmailSenderOptionsService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class BroadcastEmailController extends BaseApiController
+{
+    private BroadcastEmailSenderOptionsService $senderOptions;
+    private BroadcastEmailRecipientService $recipients;
+    private BroadcastEmailComposerService $composer;
+    private BroadcastEmailDispatchService $dispatch;
+    private BroadcastEmailImageService $imageService;
+
+    public function __construct(
+        BroadcastEmailSenderOptionsService $senderOptions,
+        BroadcastEmailRecipientService $recipients,
+        BroadcastEmailComposerService $composer,
+        BroadcastEmailDispatchService $dispatch,
+        BroadcastEmailImageService $imageService
+    ) {
+        parent::__construct();
+        $this->senderOptions = $senderOptions;
+        $this->recipients = $recipients;
+        $this->composer = $composer;
+        $this->dispatch = $dispatch;
+        $this->imageService = $imageService;
+    }
+
+    public function options(): JsonResponse
+    {
+        return response()->json([
+            'ok' => true,
+            'parents' => $this->recipients->parentsWithEmails(),
+            'fromOptions' => $this->senderOptions->listOptions(),
+        ]);
+    }
+
+    public function send(Request $request): JsonResponse
+    {
+        $mode = (string) ($request->input('mode') ?? 'standard');
+        $subject = trim((string) ($request->input('subject') ?? ''));
+        $fromKey = trim((string) ($request->input('from_key') ?? 'general'));
+        $body = (string) ($request->input('body_html') ?? '');
+        $wrapLayout = (bool) $request->boolean('wrap_layout');
+        $preheader = (string) ($request->input('preheader') ?? '');
+        $ctaText = (string) ($request->input('cta_text') ?? '');
+        $ctaUrl = (string) ($request->input('cta_url') ?? '');
+        $testEmail = trim((string) ($request->input('test_email') ?? ''));
+        $isTestOnly = (bool) $request->boolean('send_test_only');
+
+        $body = $this->composer->sanitizeHtml($body);
+
+        if ($subject === '' || $body === '') {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Subject and Body are required.',
+            ], 422);
+        }
+
+        $personalize = $mode === 'personalized';
+
+        if ($isTestOnly) {
+            if ($testEmail === '') {
+                return response()->json([
+                    'ok' => false,
+                    'message' => 'Provide a test email address.',
+                ], 422);
+            }
+
+            $result = $this->dispatch->sendTest([
+                'wrap_layout' => $wrapLayout,
+                'subject' => $subject,
+                'body_html' => $body,
+                'recipient_name' => 'Parent',
+                'preheader' => $preheader,
+                'cta_text' => $ctaText,
+                'cta_url' => $ctaUrl,
+                'personalize' => $personalize,
+                'test_email' => $testEmail,
+                'from_key' => $fromKey,
+            ]);
+
+            return response()->json($result, $result['ok'] ? 200 : 500);
+        }
+
+        $rawIds = $request->input('parent_ids', []);
+        $ids = $this->normalizeIds($rawIds);
+
+        if (empty($ids)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'Please select at least one parent.',
+            ], 422);
+        }
+
+        $recipients = $this->recipients->recipientsByIds($ids);
+
+        if (empty($recipients)) {
+            return response()->json([
+                'ok' => false,
+                'message' => 'No valid parent emails found.',
+            ], 422);
+        }
+
+        $stats = $this->dispatch->sendBroadcast([
+            'wrap_layout' => $wrapLayout,
+            'subject' => $subject,
+            'body_html' => $body,
+            'preheader' => $preheader,
+            'cta_text' => $ctaText,
+            'cta_url' => $ctaUrl,
+            'personalize' => $personalize,
+            'from_key' => $fromKey,
+            'mode' => $mode,
+        ], $recipients);
+
+        $message = sprintf(
+            'Broadcast finished. Mode: %s. Sent: %d/%d. Failures: %d.',
+            $stats['mode'],
+            $stats['sent'],
+            $stats['attempted'],
+            $stats['failed']
+        );
+
+        return response()->json([
+            'ok' => $stats['failed'] === 0,
+            'stats' => $stats,
+            'message' => $message,
+        ]);
+    }
+
+    public function uploadImage(Request $request): JsonResponse
+    {
+        $file = $request->file('image');
+        if (!$file || !$file->isValid()) {
+            return response()->json([
+                'success' => false,
+                'error' => 'No image uploaded',
+            ], 400);
+        }
+
+        $result = $this->imageService->store($file);
+        if (!$result['ok']) {
+            return response()->json([
+                'success' => false,
+                'error' => $result['error'] ?? 'Upload failed',
+            ], $result['status'] ?? 400);
+        }
+
+        $newHash = function_exists('csrf_hash') ? csrf_hash() : csrf_token();
+
+        return response()->json([
+            'success' => true,
+            'url' => $result['url'],
+            'csrf_hash' => $newHash,
+        ])->header('X-CSRF-HASH', (string) $newHash);
+    }
+
+    private function normalizeIds($rawIds): array
+    {
+        $ids = [];
+        $raw = is_array($rawIds) ? $rawIds : [$rawIds];
+
+        foreach ($raw as $value) {
+            if (is_string($value) && strpos($value, ',') !== false) {
+                foreach (explode(',', $value) as $piece) {
+                    $ids[] = (int) $piece;
+                }
+                continue;
+            }
+            $ids[] = (int) $value;
+        }
+
+        return array_values(array_unique(array_filter($ids)));
+    }
+}
diff --git a/app/Http/Controllers/Api/Expenses/ExpenseController.php b/app/Http/Controllers/Api/Expenses/ExpenseController.php
new file mode 100644
index 00000000..726f5cb7
--- /dev/null
+++ b/app/Http/Controllers/Api/Expenses/ExpenseController.php
@@ -0,0 +1,180 @@
+<?php
+
+namespace App\Http\Controllers\Api\Expenses;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Expenses\StoreExpenseRequest;
+use App\Http\Requests\Expenses\UpdateExpenseRequest;
+use App\Http\Requests\Expenses\UpdateExpenseStatusRequest;
+use App\Http\Resources\Expenses\ExpenseResource;
+use App\Http\Resources\Expenses\ExpenseStaffResource;
+use App\Models\Expense;
+use App\Services\Expenses\ExpenseContextService;
+use App\Services\Expenses\ExpenseQueryService;
+use App\Services\Expenses\ExpenseReceiptService;
+use App\Services\Expenses\ExpenseRetailorService;
+use App\Services\Expenses\ExpenseStaffService;
+use App\Services\Expenses\ExpenseStatusService;
+use App\Services\Expenses\ExpenseWriteService;
+use Illuminate\Http\JsonResponse;
+
+class ExpenseController extends BaseApiController
+{
+    public function __construct(
+        private ExpenseContextService $context,
+        private ExpenseRetailorService $retailors,
+        private ExpenseStaffService $staff,
+        private ExpenseQueryService $queryService,
+        private ExpenseReceiptService $receiptService,
+        private ExpenseWriteService $writeService,
+        private ExpenseStatusService $statusService
+    ) {
+        parent::__construct();
+    }
+
+    public function options(): JsonResponse
+    {
+        $schoolYear = $this->context->getSchoolYear();
+        $semester = $this->context->getSemester();
+
+        return response()->json([
+            'ok' => true,
+            'schoolYear' => $schoolYear,
+            'semester' => $semester,
+            'retailors' => $this->retailors->listRetailors(),
+            'staff' => ExpenseStaffResource::collection($this->staff->listStaffUsers()),
+        ]);
+    }
+
+    public function index(): JsonResponse
+    {
+        $rows = $this->queryService->listAll();
+        $rows = array_map(function ($row) {
+            $row['receipt_url'] = $this->receiptService->receiptUrl($row['receipt_path'] ?? null);
+            return $row;
+        }, $rows);
+
+        return response()->json([
+            'ok' => true,
+            'expenses' => ExpenseResource::collection($rows),
+        ]);
+    }
+
+    public function show(int $id): JsonResponse
+    {
+        $row = $this->queryService->findById($id);
+        if (!$row) {
+            return response()->json(['ok' => false, 'message' => 'Expense not found.'], 404);
+        }
+
+        $row['receipt_url'] = $this->receiptService->receiptUrl($row['receipt_path'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'expense' => new ExpenseResource($row),
+        ]);
+    }
+
+    public function store(StoreExpenseRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        $receiptName = null;
+        if ($request->hasFile('receipt')) {
+            $receiptName = $this->receiptService->storeReceipt($request->file('receipt'));
+        }
+
+        $isDonation = $payload['category'] === 'Donation';
+
+        $expense = $this->writeService->store([
+            'category' => $payload['category'],
+            'amount' => $payload['amount'],
+            'receipt_path' => $receiptName,
+            'description' => $payload['description'] ?? null,
+            'retailor' => $payload['retailor'] ?? null,
+            'date_of_purchase' => $payload['date_of_purchase'],
+            'purchased_by' => (int) $payload['purchased_by'],
+            'added_by' => $userId,
+            'status' => $isDonation ? 'approved' : 'pending',
+            'status_reason' => $isDonation ? 'Marked as Donation (non-reimbursable).' : null,
+            'approved_by' => $isDonation ? $userId : null,
+            'school_year' => $payload['school_year'] ?? null,
+            'semester' => $payload['semester'] ?? null,
+        ]);
+
+        return response()->json([
+            'ok' => true,
+            'expense' => new ExpenseResource($expense->toArray()),
+        ], 201);
+    }
+
+    public function update(UpdateExpenseRequest $request, int $id): JsonResponse
+    {
+        $expense = Expense::query()->find($id);
+        if (!$expense) {
+            return response()->json(['ok' => false, 'message' => 'Expense not found.'], 404);
+        }
+
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        $receiptName = $expense->receipt_path;
+        if ($request->hasFile('receipt')) {
+            $receiptName = $this->receiptService->storeReceipt($request->file('receipt'));
+        }
+        if (!empty($payload['remove_receipt'])) {
+            $receiptName = null;
+        }
+
+        $category = $payload['category'];
+        $isDonation = $category === 'Donation';
+
+        $updateData = [
+            'category' => $category,
+            'amount' => $payload['amount'],
+            'description' => $payload['description'] ?? null,
+            'retailor' => $payload['retailor'] ?? null,
+            'date_of_purchase' => $payload['date_of_purchase'],
+            'purchased_by' => (int) $payload['purchased_by'],
+            'receipt_path' => $receiptName,
+            'updated_by' => $userId,
+        ];
+
+        if ($isDonation) {
+            $updateData['status'] = 'approved';
+            $updateData['status_reason'] = 'Marked as Donation (non-reimbursable).';
+            $updateData['approved_by'] = $userId ?: null;
+            $updateData['reimbursement_id'] = null;
+        } elseif (($expense->category ?? '') === 'Donation') {
+            $updateData['status_reason'] = null;
+            $updateData['approved_by'] = $expense->approved_by;
+            $updateData['status'] = $expense->status ?? 'pending';
+        }
+
+        $updated = $this->writeService->update($expense, $updateData);
+
+        return response()->json([
+            'ok' => true,
+            'expense' => new ExpenseResource($updated->toArray()),
+        ]);
+    }
+
+    public function updateStatus(UpdateExpenseStatusRequest $request, int $id): JsonResponse
+    {
+        $expense = Expense::query()->find($id);
+        if (!$expense) {
+            return response()->json(['ok' => false, 'message' => 'Expense not found.'], 404);
+        }
+
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        $updated = $this->statusService->updateStatus($expense, $payload['status'], $payload['reason'] ?? '', $userId);
+
+        return response()->json([
+            'ok' => true,
+            'expense' => new ExpenseResource($updated->toArray()),
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/ExtraCharges/ExtraChargesController.php b/app/Http/Controllers/Api/ExtraCharges/ExtraChargesController.php
new file mode 100644
index 00000000..a9126454
--- /dev/null
+++ b/app/Http/Controllers/Api/ExtraCharges/ExtraChargesController.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Http\Controllers\Api\ExtraCharges;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\ExtraCharges\StoreExtraChargeRequest;
+use App\Http\Requests\ExtraCharges\UpdateExtraChargeRequest;
+use App\Http\Resources\ExtraCharges\ExtraChargeInvoiceOptionResource;
+use App\Http\Resources\ExtraCharges\ExtraChargeParentOptionResource;
+use App\Http\Resources\ExtraCharges\ExtraChargeResource;
+use App\Models\AdditionalCharge;
+use App\Services\ExtraCharges\ExtraChargesChargeService;
+use App\Services\ExtraCharges\ExtraChargesContextService;
+use App\Services\ExtraCharges\ExtraChargesInvoiceService;
+use App\Services\ExtraCharges\ExtraChargesListService;
+use App\Services\ExtraCharges\ExtraChargesMetaService;
+use App\Services\ExtraCharges\ExtraChargesParentService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ExtraChargesController extends BaseApiController
+{
+    public function __construct(
+        private ExtraChargesContextService $context,
+        private ExtraChargesMetaService $meta,
+        private ExtraChargesParentService $parents,
+        private ExtraChargesInvoiceService $invoices,
+        private ExtraChargesListService $listService,
+        private ExtraChargesChargeService $chargeService
+    ) {
+        parent::__construct();
+    }
+
+    public function list(Request $request): JsonResponse
+    {
+        $year = (string) ($request->query('school_year') ?? $this->context->getSchoolYear());
+        $sem = (string) ($request->query('semester') ?? $this->context->getSemester());
+        $status = $request->query('status') ?: null;
+        $q = trim((string) ($request->query('q') ?? '')) ?: null;
+        $per = (int) ($request->query('per_page') ?? 50);
+
+        [$rows, $meta] = $this->listService->listForTerm($year, $sem, $status, $q, $per);
+
+        return response()->json([
+            'ok' => true,
+            'school_year' => $year,
+            'semester' => $sem,
+            'rows' => ExtraChargeResource::collection($rows),
+            'pager' => $meta,
+        ]);
+    }
+
+    public function options(Request $request): JsonResponse
+    {
+        $q = trim((string) ($request->query('q') ?? ''));
+        $parentOptions = $this->parents->searchParents($q);
+
+        return response()->json([
+            'ok' => true,
+            'schoolYear' => $this->context->getSchoolYear(),
+            'semester' => $this->context->getSemester(),
+            'schoolYears' => $this->meta->getSchoolYears($this->context->getSchoolYear()),
+            'parents' => ExtraChargeParentOptionResource::collection($parentOptions),
+        ]);
+    }
+
+    public function parentOptions(Request $request): JsonResponse
+    {
+        $q = trim((string) ($request->query('q') ?? ''));
+        $parentOptions = $this->parents->searchParents($q);
+
+        return response()->json([
+            'results' => ExtraChargeParentOptionResource::collection($parentOptions),
+        ]);
+    }
+
+    public function invoicesForParent(Request $request): JsonResponse
+    {
+        $parentId = (int) ($request->query('parent_id') ?? 0);
+        $schoolYear = (string) ($request->query('school_year') ?? $this->context->getSchoolYear());
+        $rows = $this->invoices->listInvoicesForParent($parentId, $schoolYear);
+
+        return response()->json([
+            'results' => ExtraChargeInvoiceOptionResource::collection($rows),
+        ]);
+    }
+
+    public function store(StoreExtraChargeRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $payload['created_by'] = (int) (auth()->id() ?? 0);
+
+        $result = $this->chargeService->createCharge($payload);
+
+        return response()->json($result, $result['ok'] ? 201 : 422);
+    }
+
+    public function update(UpdateExtraChargeRequest $request, int $id): JsonResponse
+    {
+        $charge = AdditionalCharge::query()->find($id);
+        if (!$charge) {
+            return response()->json(['ok' => false, 'error' => 'Charge not found'], 404);
+        }
+
+        $payload = $request->validated();
+        $payload['updated_by'] = (int) (auth()->id() ?? 0);
+
+        $ok = $this->chargeService->updateCharge($charge, $payload);
+
+        return response()->json([
+            'ok' => $ok,
+            'id' => $id,
+        ], $ok ? 200 : 422);
+    }
+
+    public function void(int $id): JsonResponse
+    {
+        $charge = AdditionalCharge::query()->find($id);
+        if (!$charge) {
+            return response()->json(['ok' => false, 'error' => 'Charge not found'], 404);
+        }
+
+        $ok = $this->chargeService->voidCharge($charge);
+
+        return response()->json([
+            'ok' => $ok,
+        ], $ok ? 200 : 422);
+    }
+
+    public function reverse(int $id): JsonResponse
+    {
+        $charge = AdditionalCharge::query()->find($id);
+        if (!$charge) {
+            return response()->json(['ok' => false, 'error' => 'Charge not found'], 404);
+        }
+
+        $ok = $this->chargeService->reverseCharge($charge);
+
+        return response()->json([
+            'ok' => $ok,
+        ], $ok ? 200 : 422);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/FinancialController.php b/app/Http/Controllers/Api/Finance/FinancialController.php
new file mode 100644
index 00000000..45d84525
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/FinancialController.php
@@ -0,0 +1,218 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Finance\FinancialReportRequest;
+use App\Http\Requests\Finance\FinancialSummaryRequest;
+use App\Http\Requests\Finance\FinancialUnpaidParentsRequest;
+use App\Http\Resources\Finance\FinancialReportResource;
+use App\Http\Resources\Finance\FinancialSummaryResource;
+use App\Http\Resources\Finance\FinancialUnpaidParentResource;
+use App\Services\Finance\FinancialPdfReportService;
+use App\Services\Finance\FinancialReportService;
+use App\Services\Finance\FinancialSchoolYearService;
+use App\Services\Finance\FinancialSummaryService;
+use App\Services\Finance\FinancialUnpaidParentsService;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class FinancialController extends BaseApiController
+{
+    public function __construct(
+        private FinancialReportService $reportService,
+        private FinancialSummaryService $summaryService,
+        private FinancialUnpaidParentsService $unpaidParentsService,
+        private FinancialSchoolYearService $schoolYears,
+        private FinancialPdfReportService $pdfService
+    ) {
+        parent::__construct();
+    }
+
+    public function report(FinancialReportRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $report = $this->reportService->getReport(
+            $payload['date_from'] ?? null,
+            $payload['date_to'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'report' => new FinancialReportResource($report),
+        ]);
+    }
+
+    public function summary(FinancialSummaryRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $summary = $this->summaryService->getSummary(
+            $payload['date_from'] ?? null,
+            $payload['date_to'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        $schoolYears = $this->schoolYears->listYears($summary['schoolYear'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'summary' => new FinancialSummaryResource($summary),
+            'schoolYears' => $schoolYears,
+        ]);
+    }
+
+    public function unpaidParents(FinancialUnpaidParentsRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->unpaidParentsService->getUnpaidParents($payload['school_year'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'schoolYear' => $data['schoolYear'] ?? null,
+            'schoolYears' => $data['schoolYears'] ?? [],
+            'results' => FinancialUnpaidParentResource::collection($data['results'] ?? []),
+        ]);
+    }
+
+    public function downloadCsv(FinancialReportRequest $request): StreamedResponse
+    {
+        $payload = $request->validated();
+        $report = $this->reportService->getReport(
+            $payload['date_from'] ?? null,
+            $payload['date_to'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        $paymentsMap = [];
+        foreach ($report['payments'] as $payment) {
+            $invoiceId = (int) ($payment['invoice_id'] ?? 0);
+            $paymentsMap[$invoiceId] = (float) ($payment['paid_amount'] ?? 0);
+        }
+
+        $refundsMap = [];
+        foreach ($report['refunds'] as $refund) {
+            $invoiceId = (int) ($refund['invoice_id'] ?? 0);
+            $refundsMap[$invoiceId] = (float) ($refund['total_refunded'] ?? 0);
+        }
+
+        $discountsMap = [];
+        foreach ($report['discounts'] as $discount) {
+            $invoiceId = (int) ($discount['invoice_id'] ?? 0);
+            $discountsMap[$invoiceId] = (float) ($discount['discount_amount'] ?? 0);
+        }
+
+        $breakdown = $report['paymentBreakdown'] ?? [];
+
+        $filename = 'financial_report_' . date('Ymd_His') . '.csv';
+
+        return response()->streamDownload(function () use ($report, $paymentsMap, $refundsMap, $discountsMap, $breakdown) {
+            $out = fopen('php://output', 'w');
+
+            fputcsv($out, ['Invoice #', 'Parent', 'School Year', 'Total', 'Paid', 'Cash', 'Credit', 'Check', 'Balance', 'Refund', 'Discount', 'Status']);
+            $sumTotal = 0.0;
+            $sumPaid = 0.0;
+            $sumCash = 0.0;
+            $sumCredit = 0.0;
+            $sumCheck = 0.0;
+            $sumBalance = 0.0;
+            $sumRefund = 0.0;
+            $sumDiscount = 0.0;
+
+            foreach ($report['invoices'] as $inv) {
+                $invoiceId = (int) ($inv['id'] ?? 0);
+                $paid = (float) ($paymentsMap[$invoiceId] ?? 0);
+                $bd = $breakdown[$invoiceId] ?? [];
+                $cash = (float) ($bd['cash'] ?? 0);
+                $credit = (float) ($bd['credit'] ?? 0);
+                $check = (float) ($bd['check'] ?? 0);
+                $refunded = (float) ($refundsMap[$invoiceId] ?? 0);
+                $discount = (float) ($discountsMap[$invoiceId] ?? 0);
+                $total = (float) ($inv['total_amount'] ?? 0);
+                $balance = $total - $paid - $discount - $refunded;
+                if ($balance < 0) {
+                    $balance = 0.0;
+                }
+                $status = $balance === 0.0 ? 'Paid' : 'Unpaid';
+
+                fputcsv($out, [
+                    $inv['invoice_number'] ?? '',
+                    $inv['parent_name'] ?? '',
+                    $inv['school_year'] ?? '',
+                    $total,
+                    $paid,
+                    $cash,
+                    $credit,
+                    $check,
+                    $balance,
+                    $refunded,
+                    $discount,
+                    $status,
+                ]);
+
+                $sumTotal += $total;
+                $sumPaid += $paid;
+                $sumCash += $cash;
+                $sumCredit += $credit;
+                $sumCheck += $check;
+                $sumBalance += $balance;
+                $sumRefund += $refunded;
+                $sumDiscount += $discount;
+            }
+
+            fputcsv($out, [
+                'TOTALS',
+                '',
+                '',
+                $sumTotal,
+                $sumPaid,
+                $sumCash,
+                $sumCredit,
+                $sumCheck,
+                $sumBalance,
+                $sumRefund,
+                $sumDiscount,
+                '',
+            ]);
+
+            fputcsv($out, []);
+            fputcsv($out, ['Expenses Summary']);
+            fputcsv($out, ['Category', 'Total Amount']);
+            foreach ($report['expenses'] as $exp) {
+                fputcsv($out, [
+                    $exp['category'] ?? '',
+                    $exp['total_amount'] ?? 0,
+                ]);
+            }
+
+            fputcsv($out, []);
+            fputcsv($out, ['Reimbursements Summary']);
+            fputcsv($out, ['Status', 'Total Amount']);
+            foreach ($report['reimbursements'] as $row) {
+                fputcsv($out, [
+                    $row['status'] ?? '',
+                    $row['total_amount'] ?? 0,
+                ]);
+            }
+
+            fclose($out);
+        }, $filename, ['Content-Type' => 'text/csv']);
+    }
+
+    public function downloadPdf(FinancialReportRequest $request): StreamedResponse
+    {
+        $payload = $request->validated();
+        $summary = $this->summaryService->getSummary(
+            $payload['date_from'] ?? null,
+            $payload['date_to'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        $pdfBytes = $this->pdfService->buildPdf($summary);
+        $schoolYear = $summary['schoolYear'] ?? 'report';
+
+        return response()->streamDownload(function () use ($pdfBytes) {
+            echo $pdfBytes;
+        }, 'Financial_Report_' . $schoolYear . '.pdf', ['Content-Type' => 'application/pdf']);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/InvoiceController.php b/app/Http/Controllers/Api/Finance/InvoiceController.php
new file mode 100644
index 00000000..944187af
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/InvoiceController.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Invoices\InvoiceGenerateRequest;
+use App\Http\Requests\Invoices\InvoiceManagementRequest;
+use App\Http\Requests\Invoices\InvoiceParentRequest;
+use App\Http\Requests\Invoices\InvoiceStatusRequest;
+use App\Http\Resources\Invoices\InvoiceManagementParentResource;
+use App\Http\Resources\Invoices\InvoiceResource;
+use App\Models\Invoice;
+use App\Services\Invoices\InvoiceGenerationService;
+use App\Services\Invoices\InvoiceManagementService;
+use App\Services\Invoices\InvoicePaymentService;
+use App\Services\Invoices\InvoicePdfService;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class InvoiceController extends BaseApiController
+{
+    public function __construct(
+        private InvoiceManagementService $management,
+        private InvoiceGenerationService $generation,
+        private InvoicePaymentService $paymentService,
+        private InvoicePdfService $pdfService
+    ) {
+        parent::__construct();
+    }
+
+    public function management(InvoiceManagementRequest $request): JsonResponse
+    {
+        $schoolYear = $request->validated()['school_year'] ?? null;
+        $schoolYear = $schoolYear ?: $request->input('schoolYear');
+        $schoolYear = $schoolYear ?: $request->input('year');
+
+        $data = $this->management->getManagementData($schoolYear);
+
+        return response()->json([
+            'ok' => true,
+            'schoolYear' => $data['schoolYear'],
+            'schoolYears' => $data['schoolYears'],
+            'invoices' => InvoiceManagementParentResource::collection($data['invoices']),
+        ]);
+    }
+
+    public function generate(InvoiceGenerateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->generation->generateInvoice((int) $payload['parent_id'], $payload['school_year'] ?? null);
+
+        if (empty($result['ok'])) {
+            return response()->json(['ok' => false, 'message' => $result['message'] ?? 'Unable to generate invoice.'], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'updated' => $result['updated'] ?? false,
+            'updated_ids' => $result['updated_ids'] ?? [],
+            'insert_id' => $result['insert_id'] ?? null,
+        ]);
+    }
+
+    public function byParent(InvoiceParentRequest $request, int $parentId): JsonResponse
+    {
+        $schoolYear = $request->validated()['school_year'] ?? null;
+        $invoices = Invoice::getInvoicesByParentId($parentId, $schoolYear);
+
+        return response()->json([
+            'ok' => true,
+            'invoices' => InvoiceResource::collection($invoices),
+        ]);
+    }
+
+    public function parentPayment(InvoiceParentRequest $request): JsonResponse
+    {
+        $parentId = (int) (auth()->id() ?? 0);
+        if ($parentId <= 0) {
+            return response()->json(['ok' => false, 'message' => 'Unauthorized.'], 401);
+        }
+
+        $schoolYear = $request->validated()['school_year'] ?? null;
+        $data = $this->paymentService->getParentInvoiceSummary($parentId, $schoolYear);
+
+        return response()->json([
+            'ok' => true,
+            'invoices' => InvoiceResource::collection($data['invoices']),
+            'schoolYears' => $data['schoolYears'],
+            'selectedYear' => $data['selectedYear'],
+            'currentSchoolYear' => $data['currentSchoolYear'],
+            'dueDate' => $data['dueDate'],
+        ]);
+    }
+
+    public function updateStatus(InvoiceStatusRequest $request, int $invoiceId): JsonResponse
+    {
+        $status = $request->validated()['status'];
+        $updated = Invoice::updateInvoiceStatus($invoiceId, $status);
+
+        if (!$updated) {
+            return response()->json(['ok' => false, 'message' => 'Invoice not found.'], 404);
+        }
+
+        return response()->json(['ok' => true, 'status' => $status]);
+    }
+
+    public function unpaid(): JsonResponse
+    {
+        $rows = Invoice::getUnpaidInvoices();
+
+        return response()->json([
+            'ok' => true,
+            'invoices' => InvoiceResource::collection($rows),
+        ]);
+    }
+
+    public function pdf(int $invoiceId): StreamedResponse
+    {
+        $pdfBytes = $this->pdfService->buildPdf($invoiceId);
+
+        return response()->streamDownload(function () use ($pdfBytes) {
+            echo $pdfBytes;
+        }, 'invoice_' . $invoiceId . '.pdf', ['Content-Type' => 'application/pdf']);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaymentController.php b/app/Http/Controllers/Api/Finance/PaymentController.php
new file mode 100644
index 00000000..8b044593
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaymentController.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaymentByParentRequest;
+use App\Http\Requests\Payments\PaymentCreateRequest;
+use App\Http\Requests\Payments\PaymentUpdateBalanceRequest;
+use App\Http\Resources\Payments\PaymentResource;
+use App\Services\Payments\PaymentBalanceService;
+use App\Services\Payments\PaymentLookupService;
+use App\Services\Payments\PaymentPlanService;
+use Illuminate\Http\JsonResponse;
+
+class PaymentController extends BaseApiController
+{
+    public function __construct(
+        private PaymentPlanService $planService,
+        private PaymentLookupService $lookupService,
+        private PaymentBalanceService $balanceService
+    ) {
+        parent::__construct();
+    }
+
+    public function store(PaymentCreateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $payment = $this->planService->createPlan($payload);
+
+        return response()->json([
+            'ok' => true,
+            'payment' => new PaymentResource($payment),
+        ], 201);
+    }
+
+    public function byParent(PaymentByParentRequest $request, int $parentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $payments = $this->lookupService->getByParent($parentId, $payload['school_year'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'payments' => PaymentResource::collection($payments),
+        ]);
+    }
+
+    public function updateBalance(PaymentUpdateBalanceRequest $request, int $paymentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $updated = $this->balanceService->updateBalance($paymentId, (float) $payload['paid_amount']);
+
+        if (!$updated) {
+            return response()->json(['ok' => false, 'message' => 'Payment not found.'], 404);
+        }
+
+        return response()->json(['ok' => true]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaymentEventChargesController.php b/app/Http/Controllers/Api/Finance/PaymentEventChargesController.php
new file mode 100644
index 00000000..fa6dafd9
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaymentEventChargesController.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaymentEventChargesListRequest;
+use App\Http\Requests\Payments\PaymentEventChargesStoreRequest;
+use App\Services\Payments\PaymentEventChargesService;
+use Illuminate\Http\JsonResponse;
+
+class PaymentEventChargesController extends BaseApiController
+{
+    public function __construct(private PaymentEventChargesService $service)
+    {
+        parent::__construct();
+    }
+
+    public function index(PaymentEventChargesListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->listCharges($payload['school_year'] ?? null, $payload['semester'] ?? null);
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function store(PaymentEventChargesStoreRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        $count = $this->service->addCharges($payload, $userId);
+        if ($count === 0) {
+            return response()->json(['ok' => false, 'message' => 'No student selected.'], 422);
+        }
+
+        return response()->json(['ok' => true, 'inserted' => $count]);
+    }
+
+    public function enrolledStudents(PaymentEventChargesListRequest $request, int $parentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $students = $this->service->getEnrolledStudents($parentId, $payload['school_year'] ?? null);
+
+        return response()->json(['ok' => true, 'students' => $students]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaymentManualController.php b/app/Http/Controllers/Api/Finance/PaymentManualController.php
new file mode 100644
index 00000000..5cd5f466
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaymentManualController.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaymentManualEditRequest;
+use App\Http\Requests\Payments\PaymentManualSearchRequest;
+use App\Http\Requests\Payments\PaymentManualSuggestRequest;
+use App\Http\Requests\Payments\PaymentManualUpdateRequest;
+use App\Services\Payments\PaymentManualService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class PaymentManualController extends BaseApiController
+{
+    public function __construct(private PaymentManualService $service)
+    {
+        parent::__construct();
+    }
+
+    public function search(PaymentManualSearchRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->search(
+            (string) ($payload['search_term'] ?? ''),
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function suggest(PaymentManualSuggestRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $items = $this->service->suggest((string) ($payload['q'] ?? ''));
+
+        return response()->json(['ok' => true, 'items' => $items]);
+    }
+
+    public function record(PaymentManualUpdateRequest $request, int $invoiceId): JsonResponse
+    {
+        $payload = $request->validated();
+
+        $result = $this->service->recordPayment(
+            $invoiceId,
+            (float) $payload['amount'],
+            (string) $payload['payment_method'],
+            $payload['payment_date'] ?? null,
+            $payload['check_number'] ?? null,
+            $payload['payment_type'] ?? null,
+            $request->file('payment_file'),
+            $payload['school_year'] ?? null,
+            $payload['semester'] ?? null,
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true] + $result);
+    }
+
+    public function edit(PaymentManualEditRequest $request, int $paymentId): JsonResponse
+    {
+        $payload = $request->validated();
+
+        $this->service->editPayment(
+            $paymentId,
+            (float) $payload['paid_amount'],
+            (string) $payload['payment_method'],
+            $payload['check_number'] ?? null,
+            $request->file('payment_file'),
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function file(Request $request, string $filename)
+    {
+        $mode = (string) ($request->query('mode') ?? 'download');
+        return $this->service->serveCheckFile($filename, $mode);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaymentNotificationController.php b/app/Http/Controllers/Api/Finance/PaymentNotificationController.php
new file mode 100644
index 00000000..206f97dc
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaymentNotificationController.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaymentNotificationListRequest;
+use App\Http\Requests\Payments\PaymentNotificationSendRequest;
+use App\Http\Resources\Payments\PaymentNotificationLogResource;
+use App\Services\Payments\PaymentNotificationService;
+use Illuminate\Http\JsonResponse;
+
+class PaymentNotificationController extends BaseApiController
+{
+    public function __construct(private PaymentNotificationService $service)
+    {
+        parent::__construct();
+    }
+
+    public function index(PaymentNotificationListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $logs = $this->service->listLogs(
+            $payload['from'] ?? null,
+            $payload['to'] ?? null,
+            $payload['type'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'logs' => PaymentNotificationLogResource::collection($logs),
+        ]);
+    }
+
+    public function send(PaymentNotificationSendRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->service->send($payload);
+
+        return response()->json(['ok' => true] + $result);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaymentTransactionController.php b/app/Http/Controllers/Api/Finance/PaymentTransactionController.php
new file mode 100644
index 00000000..80954c58
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaymentTransactionController.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaymentTransactionCreateRequest;
+use App\Http\Requests\Payments\PaymentTransactionStatusRequest;
+use App\Http\Resources\Payments\PaymentTransactionResource;
+use App\Services\Payments\PaymentTransactionService;
+use Illuminate\Http\JsonResponse;
+
+class PaymentTransactionController extends BaseApiController
+{
+    public function __construct(private PaymentTransactionService $service)
+    {
+        parent::__construct();
+    }
+
+    public function store(PaymentTransactionCreateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $transaction = $this->service->create($payload);
+
+        return response()->json([
+            'ok' => true,
+            'transaction' => new PaymentTransactionResource($transaction->toArray()),
+        ], 201);
+    }
+
+    public function byPayment(int $paymentId): JsonResponse
+    {
+        $transactions = $this->service->getByPayment($paymentId);
+
+        return response()->json([
+            'ok' => true,
+            'transactions' => PaymentTransactionResource::collection($transactions),
+        ]);
+    }
+
+    public function updateStatus(PaymentTransactionStatusRequest $request, string $transactionId): JsonResponse
+    {
+        $payload = $request->validated();
+        $updated = $this->service->updateStatus($transactionId, $payload['status']);
+
+        if (!$updated) {
+            return response()->json(['ok' => false, 'message' => 'Transaction not found.'], 404);
+        }
+
+        return response()->json(['ok' => true]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaypalPaymentController.php b/app/Http/Controllers/Api/Finance/PaypalPaymentController.php
new file mode 100644
index 00000000..cfaf9530
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaypalPaymentController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaypalExecuteRequest;
+use App\Services\Payments\PaypalPaymentService;
+use Illuminate\Http\JsonResponse;
+
+class PaypalPaymentController extends BaseApiController
+{
+    public function __construct(private PaypalPaymentService $service)
+    {
+        parent::__construct();
+    }
+
+    public function redirect(): JsonResponse
+    {
+        return response()->json([
+            'ok' => true,
+            'redirect_url' => $this->service->getRedirectUrl(),
+        ]);
+    }
+
+    public function create(int $paymentId): JsonResponse
+    {
+        $result = $this->service->createPayment($paymentId);
+
+        return response()->json(['ok' => true] + $result);
+    }
+
+    public function execute(PaypalExecuteRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->service->executePayment(
+            (string) $payload['payer_id'],
+            $payload['paypal_payment_id'] ?? null
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function cancel(): JsonResponse
+    {
+        $this->service->cancelPayment();
+
+        return response()->json([
+            'ok' => true,
+            'message' => 'Payment was canceled.',
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/PaypalTransactionsController.php b/app/Http/Controllers/Api/Finance/PaypalTransactionsController.php
new file mode 100644
index 00000000..46764bbf
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/PaypalTransactionsController.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Payments\PaypalTransactionsListRequest;
+use App\Http\Resources\Payments\PaypalTransactionResource;
+use App\Services\Payments\PaypalTransactionsService;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class PaypalTransactionsController extends BaseApiController
+{
+    public function __construct(private PaypalTransactionsService $service)
+    {
+        parent::__construct();
+    }
+
+    public function index(PaypalTransactionsListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $perPage = (int) ($payload['per_page'] ?? 10);
+        $rows = $this->service->list($payload['q'] ?? null, $perPage);
+
+        return response()->json([
+            'ok' => true,
+            'transactions' => PaypalTransactionResource::collection($rows->items()),
+            'pagination' => [
+                'current_page' => $rows->currentPage(),
+                'per_page' => $rows->perPage(),
+                'total' => $rows->total(),
+                'last_page' => $rows->lastPage(),
+            ],
+        ]);
+    }
+
+    public function downloadCsv(PaypalTransactionsListRequest $request): StreamedResponse
+    {
+        $payload = $request->validated();
+        $rows = $this->service->listAll($payload['q'] ?? null);
+
+        $filename = 'paypal_transactions_' . date('Ymd_His') . '.csv';
+
+        return response()->streamDownload(function () use ($rows) {
+            $out = fopen('php://output', 'w');
+            fputcsv($out, [
+                'ID', 'Transaction ID', 'Order ID', 'Parent School ID',
+                'Email', 'Amount', 'Net Amount', 'Currency',
+                'Status', 'Event Type', 'Created At',
+            ]);
+
+            foreach ($rows as $row) {
+                fputcsv($out, [
+                    $row['id'] ?? null,
+                    $row['transaction_id'] ?? null,
+                    $row['order_id'] ?? null,
+                    $row['parent_school_id'] ?? null,
+                    $row['payer_email'] ?? null,
+                    $row['amount'] ?? null,
+                    $row['net_amount'] ?? null,
+                    $row['currency'] ?? null,
+                    $row['status'] ?? null,
+                    $row['event_type'] ?? null,
+                    $row['created_at'] ?? null,
+                ]);
+            }
+
+            fclose($out);
+        }, $filename, ['Content-Type' => 'text/csv']);
+    }
+}
diff --git a/app/Http/Controllers/Api/Finance/ReimbursementController.php b/app/Http/Controllers/Api/Finance/ReimbursementController.php
new file mode 100644
index 00000000..4a173cb6
--- /dev/null
+++ b/app/Http/Controllers/Api/Finance/ReimbursementController.php
@@ -0,0 +1,391 @@
+<?php
+
+namespace App\Http\Controllers\Api\Finance;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Files\FileNameRequest;
+use App\Http\Requests\Reimbursements\ReimbursementBatchAdminFileRequest;
+use App\Http\Requests\Reimbursements\ReimbursementBatchAssignmentRequest;
+use App\Http\Requests\Reimbursements\ReimbursementBatchCreateRequest;
+use App\Http\Requests\Reimbursements\ReimbursementBatchEmailRequest;
+use App\Http\Requests\Reimbursements\ReimbursementBatchLockRequest;
+use App\Http\Requests\Reimbursements\ReimbursementExportBatchRequest;
+use App\Http\Requests\Reimbursements\ReimbursementExportRequest;
+use App\Http\Requests\Reimbursements\ReimbursementIndexRequest;
+use App\Http\Requests\Reimbursements\ReimbursementMarkDonationRequest;
+use App\Http\Requests\Reimbursements\ReimbursementProcessRequest;
+use App\Http\Requests\Reimbursements\ReimbursementStoreRequest;
+use App\Http\Requests\Reimbursements\ReimbursementUnderProcessingRequest;
+use App\Http\Requests\Reimbursements\ReimbursementUpdateRequest;
+use App\Http\Resources\Reimbursements\ReimbursementBatchResource;
+use App\Http\Resources\Reimbursements\ReimbursementExpenseResource;
+use App\Http\Resources\Reimbursements\ReimbursementRecipientResource;
+use App\Http\Resources\Reimbursements\ReimbursementResource;
+use App\Http\Resources\Reimbursements\ReimbursementUnderProcessingItemResource;
+use App\Models\Reimbursement;
+use App\Models\ReimbursementBatch;
+use App\Services\Files\FileServeService;
+use App\Services\Reimbursements\ReimbursementBatchAssignmentService;
+use App\Services\Reimbursements\ReimbursementBatchService;
+use App\Services\Reimbursements\ReimbursementContextService;
+use App\Services\Reimbursements\ReimbursementCrudService;
+use App\Services\Reimbursements\ReimbursementDonationService;
+use App\Services\Reimbursements\ReimbursementEmailService;
+use App\Services\Reimbursements\ReimbursementExportService;
+use App\Services\Reimbursements\ReimbursementFileService;
+use App\Services\Reimbursements\ReimbursementQueryService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use RuntimeException;
+
+class ReimbursementController extends BaseApiController
+{
+    public function __construct(
+        private ReimbursementContextService $context,
+        private ReimbursementQueryService $queryService,
+        private ReimbursementDonationService $donationService,
+        private ReimbursementBatchService $batchService,
+        private ReimbursementBatchAssignmentService $assignmentService,
+        private ReimbursementFileService $fileService,
+        private ReimbursementExportService $exportService,
+        private ReimbursementEmailService $emailService,
+        private ReimbursementCrudService $crudService,
+        private FileServeService $fileServeService
+    ) {
+        parent::__construct();
+    }
+
+    public function underProcessing(ReimbursementUnderProcessingRequest $request): JsonResponse
+    {
+        $data = $this->queryService->underProcessing();
+
+        return response()->json([
+            'ok' => true,
+            'pendingItems' => ReimbursementUnderProcessingItemResource::collection($data['pendingItems'] ?? []),
+            'existingBatches' => ReimbursementBatchResource::collection($data['existingBatches'] ?? []),
+            'adminUsers' => ReimbursementRecipientResource::collection($data['adminUsers'] ?? []),
+            'itemsPayload' => ReimbursementUnderProcessingItemResource::collection($data['itemsPayload'] ?? []),
+        ]);
+    }
+
+    public function markDonation(ReimbursementMarkDonationRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        try {
+            $this->donationService->markDonation((int) $payload['expense_id'], $userId);
+        } catch (RuntimeException $e) {
+            $message = $e->getMessage();
+            $status = str_contains($message, 'not found') ? 404 : (str_contains($message, 'already') ? 409 : 422);
+            return response()->json(['ok' => false, 'message' => $message], $status);
+        } catch (\Throwable $e) {
+            return response()->json(['ok' => false, 'message' => 'Unable to mark donation right now.'], 500);
+        }
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function createBatch(ReimbursementBatchCreateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+        $schoolYear = $this->context->getSchoolYear();
+        $semester = $this->context->getSemester();
+
+        $batch = $this->batchService->createBatch($payload['title'] ?? null, $userId, $schoolYear, $semester);
+
+        return response()->json([
+            'ok' => true,
+            'batch' => $batch,
+        ], 201);
+    }
+
+    public function updateBatchAssignment(ReimbursementBatchAssignmentRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+
+        $batchId = (int) ($payload['batch_id'] ?? 0);
+        $batchNumber = $payload['batch_number'] ?? null;
+        if ($batchId <= 0 && $batchNumber !== null && trim((string) $batchNumber) !== '') {
+            $batchId = (int) $batchNumber;
+        }
+
+        $adminIdRaw = $payload['admin_id'] ?? null;
+        $adminId = ($adminIdRaw === '' || $adminIdRaw === null) ? null : (int) $adminIdRaw;
+        $reimbursementId = !empty($payload['reimbursement_id']) ? (int) $payload['reimbursement_id'] : null;
+
+        try {
+            $result = $this->assignmentService->updateAssignment(
+                (int) $payload['expense_id'],
+                $batchId,
+                $adminId,
+                $reimbursementId,
+                $this->context->getSchoolYear(),
+                $this->context->getSemester()
+            );
+        } catch (RuntimeException $e) {
+            return response()->json(['ok' => false, 'message' => $e->getMessage()], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'assignment' => $result,
+        ]);
+    }
+
+    public function lockBatch(ReimbursementBatchLockRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        try {
+            $this->batchService->lockBatch(
+                (int) $payload['batch_id'],
+                $userId,
+                $this->context->getSchoolYear(),
+                $this->context->getSemester()
+            );
+        } catch (RuntimeException $e) {
+            $message = $e->getMessage();
+            $status = str_contains($message, 'check file') ? 409 : 404;
+            return response()->json(['ok' => false, 'message' => $message], $status);
+        } catch (\Throwable $e) {
+            return response()->json(['ok' => false, 'message' => 'Unable to lock batch right now.'], 500);
+        }
+
+        return response()->json(['ok' => true, 'status' => 'closed']);
+    }
+
+    public function uploadBatchAdminFile(ReimbursementBatchAdminFileRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $batchId = (int) $payload['batch_id'];
+        $adminId = (int) $payload['admin_id'];
+
+        $batch = ReimbursementBatch::query()->find($batchId);
+        if (!$batch) {
+            return response()->json(['ok' => false, 'message' => 'Batch not found.'], 404);
+        }
+        if (strtolower((string) ($batch->status ?? '')) !== ReimbursementBatch::STATUS_OPEN) {
+            return response()->json(['ok' => false, 'message' => 'Cannot upload files for a locked batch.'], 409);
+        }
+
+        try {
+            $file = $this->fileService->storeAdminFile($batchId, $adminId, $request->file('check_file'), (int) (auth()->id() ?? 0));
+        } catch (\Throwable $e) {
+            return response()->json(['ok' => false, 'message' => 'Unable to store the uploaded file.'], 500);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'file' => $file,
+        ]);
+    }
+
+    public function serveAdminCheckFile(FileNameRequest $request, string $name, string $mode = 'inline'): Response|JsonResponse
+    {
+        $allowedExtensions = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'];
+        $meta = $this->fileServeService->meta(storage_path('uploads/reimbursements'), $name, $allowedExtensions, null);
+        $disposition = strtolower(trim($mode)) === 'download' ? 'attachment' : 'inline';
+
+        return response(file_get_contents($meta['path']), 200, [
+            'Content-Type' => $meta['mime'],
+            'Content-Disposition' => $disposition . '; filename="' . $meta['download_name'] . '"',
+            'Content-Length' => (string) $meta['size'],
+            'ETag' => $meta['etag'],
+            'Last-Modified' => $meta['last_modified'],
+        ]);
+    }
+
+    public function index(ReimbursementIndexRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $filters = [
+            'school_year' => $payload['school_year'] ?? null,
+            'semester' => $payload['semester'] ?? null,
+            'status' => $payload['status'] ?? null,
+            'user_id' => $payload['user_id'] ?? null,
+        ];
+
+        $data = $this->queryService->index($filters);
+
+        return response()->json([
+            'ok' => true,
+            'expenses' => ReimbursementExpenseResource::collection($data['expenses'] ?? []),
+            'users' => ReimbursementRecipientResource::collection($data['users'] ?? []),
+            'schoolYears' => $data['schoolYears'] ?? [],
+            'batchSummaries' => $data['batchSummaries'] ?? [],
+            'batchDetails' => $data['batchDetails'] ?? [],
+            'batchAttachments' => $data['batchAttachments'] ?? [],
+            'donationBatch' => $data['donationBatch'] ?? null,
+            'donationDetails' => $data['donationDetails'] ?? null,
+        ]);
+    }
+
+    public function sendBatchEmail(ReimbursementBatchEmailRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $receiptIds = $payload['receipts'] ?? [];
+        $checkIds = $payload['checks'] ?? [];
+
+        try {
+            $ok = $this->emailService->sendBatchEmail(
+                (int) $payload['batch_id'],
+                $payload['recipient_email'],
+                (string) ($payload['message'] ?? ''),
+                $receiptIds,
+                $checkIds
+            );
+        } catch (RuntimeException $e) {
+            return response()->json(['ok' => false, 'message' => $e->getMessage()], 404);
+        }
+
+        if (!$ok) {
+            return response()->json(['ok' => false, 'message' => 'Failed to send email. Please try again.'], 500);
+        }
+
+        return response()->json(['ok' => true, 'message' => 'Email sent successfully.']);
+    }
+
+    public function export(ReimbursementExportRequest $request): Response
+    {
+        $payload = $request->validated();
+        $type = $payload['type'] ?? 'processed';
+
+        if ($type === 'under_processing') {
+            $csv = $this->exportService->buildUnderProcessingCsv();
+        } else {
+            $csv = $this->exportService->buildProcessedCsv($payload);
+        }
+
+        return response()->streamDownload(function () use ($csv) {
+            $out = fopen('php://output', 'w');
+            fprintf($out, chr(0xEF) . chr(0xBB) . chr(0xBF));
+            foreach ($csv['rows'] as $row) {
+                fputcsv($out, $row);
+            }
+            fclose($out);
+        }, $csv['filename'], [
+            'Content-Type' => 'text/csv; charset=UTF-8',
+        ]);
+    }
+
+    public function exportBatch(ReimbursementExportBatchRequest $request): Response
+    {
+        $payload = $request->validated();
+        $csv = $this->exportService->buildBatchCsv((int) $payload['batch_id']);
+
+        return response()->streamDownload(function () use ($csv) {
+            $out = fopen('php://output', 'w');
+            fprintf($out, chr(0xEF) . chr(0xBB) . chr(0xBF));
+            foreach ($csv['rows'] as $row) {
+                fputcsv($out, $row);
+            }
+            fclose($out);
+        }, $csv['filename'], [
+            'Content-Type' => 'text/csv; charset=UTF-8',
+        ]);
+    }
+
+    public function store(ReimbursementStoreRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+        $receiptName = null;
+
+        if ($request->hasFile('receipt')) {
+            $receiptName = $this->fileService->storeReceipt($request->file('receipt'));
+        }
+
+        try {
+            $reimb = $this->crudService->store(
+                $payload,
+                $userId,
+                $this->context->getSchoolYear(),
+                $this->context->getSemester(),
+                $receiptName
+            );
+        } catch (RuntimeException $e) {
+            return response()->json(['ok' => false, 'message' => $e->getMessage()], 422);
+        }
+
+        $data = $reimb->toArray();
+        $data['receipt_url'] = $this->fileService->receiptUrl($reimb->receipt_path ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'reimbursement' => new ReimbursementResource($data),
+        ], 201);
+    }
+
+    public function process(ReimbursementProcessRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+        $receiptName = null;
+
+        if ($request->hasFile('receipt')) {
+            $receiptName = $this->fileService->storeReceipt($request->file('receipt'));
+        }
+
+        try {
+            $reimb = $this->crudService->process(
+                $payload,
+                $userId,
+                $this->context->getSchoolYear(),
+                $this->context->getSemester(),
+                $receiptName
+            );
+        } catch (RuntimeException $e) {
+            return response()->json(['ok' => false, 'message' => $e->getMessage()], 422);
+        }
+
+        $data = $reimb->toArray();
+        $data['receipt_url'] = $this->fileService->receiptUrl($reimb->receipt_path ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'reimbursement' => new ReimbursementResource($data),
+        ], 201);
+    }
+
+    public function reimbursedExpenses(): JsonResponse
+    {
+        $expenses = $this->queryService->reimbursedExpenses();
+
+        return response()->json([
+            'ok' => true,
+            'expenses' => $expenses,
+        ]);
+    }
+
+    public function update(ReimbursementUpdateRequest $request, int $id): JsonResponse
+    {
+        $reimb = Reimbursement::query()->find($id);
+        if (!$reimb) {
+            return response()->json(['ok' => false, 'message' => 'Reimbursement not found.'], 404);
+        }
+
+        $payload = $request->validated();
+        $userId = (int) (auth()->id() ?? 0);
+
+        $receiptName = $reimb->receipt_path;
+        if ($request->hasFile('receipt')) {
+            $receiptName = $this->fileService->storeReceipt($request->file('receipt'));
+        }
+        if (!empty($payload['remove_receipt'])) {
+            $receiptName = null;
+        }
+
+        $updated = $this->crudService->update($reimb, $payload, $userId, $receiptName);
+        $data = $updated->toArray();
+        $data['receipt_url'] = $this->fileService->receiptUrl($updated->receipt_path ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'reimbursement' => new ReimbursementResource($data),
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Grading/GradingController.php b/app/Http/Controllers/Api/Grading/GradingController.php
new file mode 100644
index 00000000..11516b36
--- /dev/null
+++ b/app/Http/Controllers/Api/Grading/GradingController.php
@@ -0,0 +1,281 @@
+<?php
+
+namespace App\Http\Controllers\Api\Grading;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Grading\BelowSixtyEmailRequest;
+use App\Http\Requests\Grading\BelowSixtyMeetingRequest;
+use App\Http\Requests\Grading\BelowSixtyMeetingSaveRequest;
+use App\Http\Requests\Grading\BelowSixtySendRequest;
+use App\Http\Requests\Grading\BelowSixtyStatusRequest;
+use App\Http\Requests\Grading\BelowSixtyListRequest;
+use App\Http\Requests\Grading\GradingLockAllRequest;
+use App\Http\Requests\Grading\GradingLockRequest;
+use App\Http\Requests\Grading\GradingOverviewRequest;
+use App\Http\Requests\Grading\GradingRefreshRequest;
+use App\Http\Requests\Grading\GradingScoreShowRequest;
+use App\Http\Requests\Grading\GradingScoreUpdateRequest;
+use App\Http\Requests\Grading\PlacementBatchRequest;
+use App\Http\Requests\Grading\PlacementBatchUpdateRequest;
+use App\Http\Requests\Grading\PlacementLevelsRequest;
+use App\Http\Requests\Grading\PlacementLevelRequest;
+use App\Http\Requests\Grading\PlacementRequest;
+use App\Http\Resources\Grading\BelowSixtyStudentResource;
+use App\Http\Resources\Grading\GradingScoreResource;
+use App\Services\Grading\GradingBelowSixtyService;
+use App\Services\Grading\GradingLockService;
+use App\Services\Grading\GradingOverviewService;
+use App\Services\Grading\GradingPlacementService;
+use App\Services\Grading\GradingRefreshService;
+use App\Services\Grading\GradingScoreService;
+use Illuminate\Http\JsonResponse;
+
+class GradingController extends BaseApiController
+{
+    public function __construct(
+        private GradingOverviewService $overviewService,
+        private GradingScoreService $scoreService,
+        private GradingLockService $lockService,
+        private GradingRefreshService $refreshService,
+        private GradingPlacementService $placementService,
+        private GradingBelowSixtyService $belowSixtyService
+    ) {
+        parent::__construct();
+    }
+
+    public function overview(GradingOverviewRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->overviewService->overview(
+            isset($payload['class_id']) ? (int) $payload['class_id'] : null,
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function show(GradingScoreShowRequest $request, string $type, int $classSectionId, int $studentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->scoreService->show(
+            $type,
+            $classSectionId,
+            $studentId,
+            (string) $payload['semester'],
+            (string) $payload['school_year']
+        );
+
+        return response()->json([
+            'ok' => true,
+            'student' => $data['student'],
+            'scores' => GradingScoreResource::collection($data['scores']),
+            'type' => $data['type'],
+            'class_section_id' => $data['class_section_id'],
+            'semester' => $data['semester'],
+            'scores_locked' => $data['scores_locked'],
+        ]);
+    }
+
+    public function update(GradingScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->scoreService->update($payload, (int) (auth()->id() ?? 0));
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function toggleLock(GradingLockRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $locked = $this->lockService->toggle(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true, 'locked' => $locked]);
+    }
+
+    public function lockAll(GradingLockAllRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->lockService->lockAll(
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true, 'locked_count' => $count]);
+    }
+
+    public function refresh(GradingRefreshRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->refreshService->refreshSemesterScores(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year']
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function placement(PlacementRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->placementService->placementContext(
+            isset($payload['class_section_id']) ? (int) $payload['class_section_id'] : null,
+            (string) $payload['school_year'],
+            $payload['placement_test'] ?? null,
+            $payload['open'] ?? null
+        );
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function updatePlacementLevel(PlacementLevelRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->placementService->updatePlacementLevel(
+            (int) $payload['student_id'],
+            (string) $payload['school_year'],
+            $payload['placement_level'] ?? null,
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function updatePlacementLevels(PlacementLevelsRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->placementService->updatePlacementLevels(
+            (int) $payload['class_section_id'],
+            (string) $payload['school_year'],
+            $payload['placement_level'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function createPlacementBatch(PlacementBatchRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $batchId = $this->placementService->createPlacementBatch(
+            (string) $payload['school_year'],
+            (string) $payload['placement_test'],
+            $payload['placement_level'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true, 'batch_id' => $batchId]);
+    }
+
+    public function showPlacementBatch(int $batchId): JsonResponse
+    {
+        $data = $this->placementService->getPlacementBatch($batchId);
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function updatePlacementBatch(PlacementBatchUpdateRequest $request, int $batchId): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->placementService->updatePlacementBatch(
+            $batchId,
+            (string) $payload['school_year'],
+            $payload['placement_level'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function belowSixty(BelowSixtyListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $rows = $this->belowSixtyService->listRows(
+            (string) $payload['school_year'],
+            (string) $payload['semester']
+        );
+
+        return response()->json([
+            'ok' => true,
+            'rows' => BelowSixtyStudentResource::collection($rows),
+            'semester' => $payload['semester'],
+            'school_year' => $payload['school_year'],
+        ]);
+    }
+
+    public function belowSixtyEmail(BelowSixtyEmailRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->belowSixtyService->emailContext(
+            (int) $payload['student_id'],
+            (string) $payload['school_year'],
+            (string) $payload['semester']
+        );
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function sendBelowSixtyEmail(BelowSixtySendRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->belowSixtyService->emailContext(
+            (int) $payload['student_id'],
+            (string) $payload['school_year'],
+            (string) $payload['semester']
+        );
+
+        $subject = trim((string) ($payload['subject'] ?? ''));
+        if ($subject !== '') {
+            $data['subject'] = $subject;
+        }
+        if (isset($payload['html']) && trim((string) $payload['html']) !== '') {
+            $data['html'] = (string) $payload['html'];
+        }
+
+        $this->belowSixtyService->sendEmail($data);
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function updateBelowSixtyStatus(BelowSixtyStatusRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->belowSixtyService->updateStatus(
+            (int) $payload['student_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            (string) $payload['status'],
+            (string) ($payload['note'] ?? ''),
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function belowSixtyMeeting(BelowSixtyMeetingRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->belowSixtyService->meetingContext(
+            (int) $payload['student_id'],
+            (string) $payload['school_year'],
+            (string) $payload['semester']
+        );
+
+        return response()->json(['ok' => true] + $data);
+    }
+
+    public function saveBelowSixtyMeeting(BelowSixtyMeetingSaveRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->belowSixtyService->saveMeeting($payload, (int) (auth()->id() ?? 0));
+
+        return response()->json(['ok' => true]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Grading/HomeworkTrackingController.php b/app/Http/Controllers/Api/Grading/HomeworkTrackingController.php
new file mode 100644
index 00000000..17f873e6
--- /dev/null
+++ b/app/Http/Controllers/Api/Grading/HomeworkTrackingController.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Controllers\Api\Grading;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Grading\HomeworkTrackingRequest;
+use App\Http\Resources\Grading\HomeworkTrackingTeacherResource;
+use App\Services\Grading\HomeworkTrackingService;
+use Illuminate\Http\JsonResponse;
+
+class HomeworkTrackingController extends BaseApiController
+{
+    public function __construct(private HomeworkTrackingService $service)
+    {
+        parent::__construct();
+    }
+
+    public function index(HomeworkTrackingRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->report(
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null,
+            isset($payload['page']) ? (int) $payload['page'] : 1
+        );
+
+        return response()->json([
+            'ok' => true,
+            'semester' => $data['semester'],
+            'school_year' => $data['school_year'],
+            'sundays' => $data['sundays'],
+            'event_days' => $data['event_days'],
+            'date_to_index' => $data['date_to_index'],
+            'teachers' => HomeworkTrackingTeacherResource::collection($data['teachers']),
+            'has_homework' => $data['has_homework'],
+            'hw_entered_at' => $data['hw_entered_at'],
+            'has_homework_by_date' => $data['has_homework_by_date'],
+            'hw_entered_at_by_date' => $data['hw_entered_at_by_date'],
+            'page' => $data['page'],
+            'total_pages' => $data['total_pages'],
+            'per_page' => $data['per_page'],
+            'total_rows' => $data['total_rows'],
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Incidents/IncidentController.php b/app/Http/Controllers/Api/Incidents/IncidentController.php
new file mode 100644
index 00000000..1d30d344
--- /dev/null
+++ b/app/Http/Controllers/Api/Incidents/IncidentController.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Http\Controllers\Api\Incidents;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Incidents\IncidentCancelRequest;
+use App\Http\Requests\Incidents\IncidentCloseRequest;
+use App\Http\Requests\Incidents\IncidentListRequest;
+use App\Http\Requests\Incidents\IncidentStateRequest;
+use App\Http\Requests\Incidents\IncidentStoreRequest;
+use App\Http\Resources\Incidents\IncidentAnalysisStudentResource;
+use App\Http\Resources\Incidents\IncidentGradeResource;
+use App\Http\Resources\Incidents\IncidentResource;
+use App\Http\Resources\Incidents\IncidentStudentOptionResource;
+use App\Services\Incidents\CurrentIncidentService;
+use App\Services\Incidents\IncidentAnalysisService;
+use App\Services\Incidents\IncidentHistoryService;
+use Illuminate\Http\JsonResponse;
+
+class IncidentController extends BaseApiController
+{
+    public function __construct(
+        private CurrentIncidentService $currentService,
+        private IncidentHistoryService $historyService,
+        private IncidentAnalysisService $analysisService
+    ) {
+        parent::__construct();
+    }
+
+    public function current(): JsonResponse
+    {
+        $data = $this->currentService->listCurrent();
+
+        return response()->json([
+            'ok' => true,
+            'incidents' => IncidentResource::collection($data['incidents']),
+            'grades' => IncidentGradeResource::collection($data['grades']),
+        ]);
+    }
+
+    public function history(IncidentListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $incidents = $this->historyService->history($payload['school_year'] ?? null, $payload['semester'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'incidents' => IncidentResource::collection($incidents),
+        ]);
+    }
+
+    public function processed(IncidentListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $incidents = $this->historyService->processed($payload['school_year'] ?? null, $payload['semester'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'incidents' => IncidentResource::collection($incidents),
+        ]);
+    }
+
+    public function analysis(IncidentListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $students = $this->analysisService->analyze($payload['school_year'] ?? null, $payload['semester'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'students' => IncidentAnalysisStudentResource::collection($students),
+            'school_year' => $payload['school_year'] ?? null,
+            'semester' => $payload['semester'] ?? null,
+        ]);
+    }
+
+    public function studentsByGrade(int $gradeId): JsonResponse
+    {
+        $students = $this->currentService->studentsByGrade($gradeId);
+
+        return response()->json([
+            'ok' => true,
+            'students' => IncidentStudentOptionResource::collection($students),
+        ]);
+    }
+
+    public function store(IncidentStoreRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->currentService->addIncident($payload, (int) (auth()->id() ?? 0));
+
+        if (empty($result['ok'])) {
+            return response()->json(['ok' => false, 'message' => $result['message'] ?? 'Failed to add incident.'], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'created' => $result['created'],
+            'incident_id' => $result['incident_id'],
+        ]);
+    }
+
+    public function updateState(IncidentStateRequest $request, int $incidentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $updated = $this->currentService->updateState($incidentId, (string) $payload['incident_state']);
+
+        return response()->json([
+            'ok' => $updated,
+        ]);
+    }
+
+    public function close(IncidentCloseRequest $request, int $incidentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->currentService->closeIncident(
+            $incidentId,
+            (string) $payload['state_description'],
+            $payload['action_taken'] ?? null,
+            (int) (auth()->id() ?? 0)
+        );
+
+        if (empty($result['ok'])) {
+            return response()->json(['ok' => false, 'message' => $result['message'] ?? 'Failed to close incident.'], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'incident_id' => $result['incident_id'],
+        ]);
+    }
+
+    public function cancel(IncidentCancelRequest $request, int $incidentId): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->currentService->cancelIncident(
+            $incidentId,
+            $payload['state_description'] ?? null,
+            $payload['action_taken'] ?? null,
+            (int) (auth()->id() ?? 0)
+        );
+
+        if (empty($result['ok'])) {
+            return response()->json(['ok' => false, 'message' => $result['message'] ?? 'Failed to cancel incident.'], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'incident_id' => $result['incident_id'],
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Reports/FilesController.php b/app/Http/Controllers/Api/Reports/FilesController.php
new file mode 100644
index 00000000..29ec1197
--- /dev/null
+++ b/app/Http/Controllers/Api/Reports/FilesController.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Http\Controllers\Api\Reports;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Files\FileNameRequest;
+use App\Http\Resources\Files\FileMetaResource;
+use App\Services\Files\ExamDraftDownloadNameService;
+use App\Services\Files\FileServeService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+
+class FilesController extends BaseApiController
+{
+    public function __construct(
+        private FileServeService $fileService,
+        private ExamDraftDownloadNameService $draftNameService
+    ) {
+        parent::__construct();
+    }
+
+    public function receipt(FileNameRequest $request, string $name): Response|JsonResponse
+    {
+        return $this->serveFile(
+            $request,
+            storage_path('uploads/receipts'),
+            $name,
+            ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'],
+            null,
+            false
+        );
+    }
+
+    public function reimb(FileNameRequest $request, string $name): Response|JsonResponse
+    {
+        return $this->serveFile(
+            $request,
+            storage_path('uploads/reimbursements'),
+            $name,
+            ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'],
+            null,
+            true
+        );
+    }
+
+    public function earlyDismissalSignature(FileNameRequest $request, string $name): Response|JsonResponse
+    {
+        return $this->serveFile(
+            $request,
+            storage_path('uploads/early_dismissal_signatures'),
+            $name,
+            ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'],
+            null,
+            true
+        );
+    }
+
+    public function examDraftTeacher(FileNameRequest $request, string $name): Response|JsonResponse
+    {
+        $downloadName = $this->draftNameService->build($name, 'drafts');
+
+        return $this->serveFile(
+            $request,
+            storage_path('uploads/exams/drafts'),
+            $name,
+            ['doc', 'docx', 'pdf'],
+            $downloadName,
+            true
+        );
+    }
+
+    public function examDraftFinal(FileNameRequest $request, string $name): Response|JsonResponse
+    {
+        $downloadName = $this->draftNameService->build($name, 'finals');
+
+        return $this->serveFile(
+            $request,
+            storage_path('uploads/exams/finals'),
+            $name,
+            ['doc', 'docx', 'pdf'],
+            $downloadName,
+            true
+        );
+    }
+
+    private function serveFile(
+        FileNameRequest $request,
+        string $baseDir,
+        string $name,
+        array $allowedExtensions,
+        ?string $downloadName,
+        bool $nosniff
+    ): Response|JsonResponse {
+        if ($request->boolean('meta')) {
+            $meta = $this->fileService->meta($baseDir, $name, $allowedExtensions, $downloadName);
+
+            return response()->json([
+                'ok' => true,
+                'file' => new FileMetaResource($meta),
+            ]);
+        }
+
+        return $this->fileService->serveInline($baseDir, $name, $allowedExtensions, $request, $downloadName, $nosniff);
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/FinalController.php b/app/Http/Controllers/Api/Scores/FinalController.php
new file mode 100644
index 00000000..7ba0f37b
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/FinalController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreClassRequest;
+use App\Http\Requests\Scores\ScoreUpdateRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Models\Student;
+use App\Services\Scores\ExamScoreService;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Http\JsonResponse;
+
+class FinalController extends BaseApiController
+{
+    public function __construct(
+        private ExamScoreService $service,
+        private SemesterScoreService $semesterScoreService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(ScoreClassRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list('final_exam', (int) $payload['class_section_id'], $payload['semester'] ?? null, $payload['school_year'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students']),
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'scores_locked' => $data['scoresLocked'],
+            'missing_ok_map' => $data['missingOkMap'],
+        ]);
+    }
+
+    public function update(ScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->service->update(
+            'final_exam',
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['scores'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        $this->refreshSemesterScores((int) $payload['class_section_id'], (string) $payload['semester'], (string) $payload['school_year']);
+
+        return response()->json(['ok' => true, 'updated' => $count]);
+    }
+
+    private function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        $studentInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, (int) (auth()->id() ?? 0));
+        if (empty($studentInfo)) {
+            return;
+        }
+        try {
+            $this->semesterScoreService->updateScoresForStudents($studentInfo, $semester, $schoolYear);
+        } catch (\Throwable $e) {
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/HomeworkController.php b/app/Http/Controllers/Api/Scores/HomeworkController.php
new file mode 100644
index 00000000..a78ab68f
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/HomeworkController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreAddColumnRequest;
+use App\Http\Requests\Scores\ScoreClassRequest;
+use App\Http\Requests\Scores\ScoreUpdateRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Models\Student;
+use App\Services\Scores\HomeworkScoreService;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Http\JsonResponse;
+
+class HomeworkController extends BaseApiController
+{
+    public function __construct(
+        private HomeworkScoreService $service,
+        private SemesterScoreService $semesterScoreService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(ScoreClassRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list(
+            (int) $payload['class_section_id'],
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students']),
+            'headers' => $data['headers'],
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'scores_locked' => $data['scoresLocked'],
+            'missing_ok_map' => $data['missingOkMap'],
+        ]);
+    }
+
+    public function update(ScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->service->update(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['scores'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        $this->refreshSemesterScores((int) $payload['class_section_id'], (string) $payload['semester'], (string) $payload['school_year']);
+
+        return response()->json(['ok' => true, 'updated' => $count]);
+    }
+
+    public function addColumn(ScoreAddColumnRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $nextIndex = $this->service->addColumn(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true, 'homework_index' => $nextIndex]);
+    }
+
+    private function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        $studentInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, (int) (auth()->id() ?? 0));
+        if (empty($studentInfo)) {
+            return;
+        }
+        try {
+            $this->semesterScoreService->updateScoresForStudents($studentInfo, $semester, $schoolYear);
+        } catch (\Throwable $e) {
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/MidtermController.php b/app/Http/Controllers/Api/Scores/MidtermController.php
new file mode 100644
index 00000000..25e8d335
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/MidtermController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreClassRequest;
+use App\Http\Requests\Scores\ScoreUpdateRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Models\Student;
+use App\Services\Scores\ExamScoreService;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Http\JsonResponse;
+
+class MidtermController extends BaseApiController
+{
+    public function __construct(
+        private ExamScoreService $service,
+        private SemesterScoreService $semesterScoreService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(ScoreClassRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list('midterm_exam', (int) $payload['class_section_id'], $payload['semester'] ?? null, $payload['school_year'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students']),
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'scores_locked' => $data['scoresLocked'],
+            'missing_ok_map' => $data['missingOkMap'],
+        ]);
+    }
+
+    public function update(ScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->service->update(
+            'midterm_exam',
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['scores'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        $this->refreshSemesterScores((int) $payload['class_section_id'], (string) $payload['semester'], (string) $payload['school_year']);
+
+        return response()->json(['ok' => true, 'updated' => $count]);
+    }
+
+    private function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        $studentInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, (int) (auth()->id() ?? 0));
+        if (empty($studentInfo)) {
+            return;
+        }
+        try {
+            $this->semesterScoreService->updateScoresForStudents($studentInfo, $semester, $schoolYear);
+        } catch (\Throwable $e) {
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/ParticipationController.php b/app/Http/Controllers/Api/Scores/ParticipationController.php
new file mode 100644
index 00000000..62a468b9
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/ParticipationController.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreClassRequest;
+use App\Http\Requests\Scores\ScoreUpdateRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Models\Student;
+use App\Services\Scores\ParticipationScoreService;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Http\JsonResponse;
+
+class ParticipationController extends BaseApiController
+{
+    public function __construct(
+        private ParticipationScoreService $service,
+        private SemesterScoreService $semesterScoreService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(ScoreClassRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list(
+            (int) $payload['class_section_id'],
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students']),
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'scores_locked' => $data['scoresLocked'],
+            'missing_ok_map' => $data['missingOkMap'],
+        ]);
+    }
+
+    public function update(ScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->service->update(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['scores'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        $this->refreshSemesterScores((int) $payload['class_section_id'], (string) $payload['semester'], (string) $payload['school_year']);
+
+        return response()->json(['ok' => true, 'updated' => $count]);
+    }
+
+    private function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        $studentInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, (int) (auth()->id() ?? 0));
+        if (empty($studentInfo)) {
+            return;
+        }
+        try {
+            $this->semesterScoreService->updateScoresForStudents($studentInfo, $semester, $schoolYear);
+        } catch (\Throwable $e) {
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/ProjectController.php b/app/Http/Controllers/Api/Scores/ProjectController.php
new file mode 100644
index 00000000..4116cd2e
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/ProjectController.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreAddColumnRequest;
+use App\Http\Requests\Scores\ScoreClassRequest;
+use App\Http\Requests\Scores\ScoreUpdateRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Models\Student;
+use App\Services\Scores\ProjectScoreService;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Http\JsonResponse;
+
+class ProjectController extends BaseApiController
+{
+    public function __construct(
+        private ProjectScoreService $service,
+        private SemesterScoreService $semesterScoreService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(ScoreClassRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list(
+            (int) $payload['class_section_id'],
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students']),
+            'headers' => $data['headers'],
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'scores_locked' => $data['scoresLocked'],
+            'missing_ok_map' => $data['missingOkMap'],
+        ]);
+    }
+
+    public function update(ScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->service->update(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['scores'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        $this->refreshSemesterScores((int) $payload['class_section_id'], (string) $payload['semester'], (string) $payload['school_year']);
+
+        return response()->json(['ok' => true, 'updated' => $count]);
+    }
+
+    public function addColumn(ScoreAddColumnRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $nextIndex = $this->service->addColumn(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true, 'project_index' => $nextIndex]);
+    }
+
+    private function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        $studentInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, (int) (auth()->id() ?? 0));
+        if (empty($studentInfo)) {
+            return;
+        }
+        try {
+            $this->semesterScoreService->updateScoresForStudents($studentInfo, $semester, $schoolYear);
+        } catch (\Throwable $e) {
+            // swallow errors to keep API response stable
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/QuizController.php b/app/Http/Controllers/Api/Scores/QuizController.php
new file mode 100644
index 00000000..1eeed557
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/QuizController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreAddColumnRequest;
+use App\Http\Requests\Scores\ScoreClassRequest;
+use App\Http\Requests\Scores\ScoreUpdateRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Models\Student;
+use App\Services\Scores\QuizScoreService;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Http\JsonResponse;
+
+class QuizController extends BaseApiController
+{
+    public function __construct(
+        private QuizScoreService $service,
+        private SemesterScoreService $semesterScoreService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(ScoreClassRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list(
+            (int) $payload['class_section_id'],
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students']),
+            'headers' => $data['headers'],
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'scores_locked' => $data['scoresLocked'],
+            'missing_ok_map' => $data['missingOkMap'],
+        ]);
+    }
+
+    public function update(ScoreUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $count = $this->service->update(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['scores'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        $this->refreshSemesterScores((int) $payload['class_section_id'], (string) $payload['semester'], (string) $payload['school_year']);
+
+        return response()->json(['ok' => true, 'updated' => $count]);
+    }
+
+    public function addColumn(ScoreAddColumnRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $nextIndex = $this->service->addColumn(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true, 'quiz_index' => $nextIndex]);
+    }
+
+    private function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        $studentInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, (int) (auth()->id() ?? 0));
+        if (empty($studentInfo)) {
+            return;
+        }
+        try {
+            $this->semesterScoreService->updateScoresForStudents($studentInfo, $semester, $schoolYear);
+        } catch (\Throwable $e) {
+        }
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/ScoreCommentController.php b/app/Http/Controllers/Api/Scores/ScoreCommentController.php
new file mode 100644
index 00000000..b362381c
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/ScoreCommentController.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreCommentListRequest;
+use App\Http\Requests\Scores\ScoreCommentSaveRequest;
+use App\Http\Requests\Scores\ScoreCommentUpdateRequest;
+use App\Http\Resources\Scores\ScoreCommentResource;
+use App\Services\Scores\ScoreCommentService;
+use Illuminate\Http\JsonResponse;
+
+class ScoreCommentController extends BaseApiController
+{
+    public function __construct(private ScoreCommentService $service)
+    {
+        parent::__construct();
+    }
+
+    public function index(ScoreCommentListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->list(
+            $payload['class_section_id'] ?? null,
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        $studentRows = [];
+        foreach ($data['students'] as $student) {
+            $studentId = (int) ($student['student_id'] ?? 0);
+            $studentRows[] = [
+                'student_id' => $studentId,
+                'firstname' => $student['firstname'] ?? null,
+                'lastname' => $student['lastname'] ?? null,
+                'school_id' => $student['school_id'] ?? null,
+                'comments' => $data['comments'][$studentId] ?? [],
+            ];
+        }
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreCommentResource::collection($studentRows),
+            'semester' => $data['semester'],
+            'school_year' => $data['schoolYear'],
+            'class_section_id' => $data['classSectionId'],
+            'scores_locked' => $data['scoresLocked'],
+        ]);
+    }
+
+    public function store(ScoreCommentSaveRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->service->save(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['comments'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        if (!empty($result['errors'])) {
+            return response()->json(['ok' => false, 'errors' => $result['errors']], 422);
+        }
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function update(ScoreCommentUpdateRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->service->update(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['comments'] ?? [],
+            $payload['reviews'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        if (!empty($result['errors'])) {
+            return response()->json(['ok' => false, 'errors' => $result['errors']], 422);
+        }
+
+        return response()->json(['ok' => true]);
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/ScoreController.php b/app/Http/Controllers/Api/Scores/ScoreController.php
new file mode 100644
index 00000000..d801db54
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/ScoreController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScoreLockRequest;
+use App\Http\Requests\Scores\ScoreOverviewRequest;
+use App\Http\Requests\Scores\ScoreStudentRequest;
+use App\Http\Resources\Scores\ScoreStudentResource;
+use App\Services\Scores\ScoreDashboardService;
+use Illuminate\Http\JsonResponse;
+
+class ScoreController extends BaseApiController
+{
+    public function __construct(private ScoreDashboardService $service)
+    {
+        parent::__construct();
+    }
+
+    public function overview(ScoreOverviewRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $teacherId = (int) (auth()->id() ?? 0);
+
+        $data = $this->service->overview(
+            $teacherId,
+            isset($payload['class_section_id']) ? (int) $payload['class_section_id'] : null,
+            $payload['semester'] ?? null,
+            $payload['school_year'] ?? null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScoreStudentResource::collection($data['students'] ?? []),
+            'class_section_id' => $data['class_section_id'] ?? null,
+            'class_section_name' => $data['class_section_name'] ?? null,
+            'semester' => $data['semester'] ?? null,
+            'school_year' => $data['school_year'] ?? null,
+            'scores_locked' => $data['scoresLocked'] ?? false,
+        ]);
+    }
+
+    public function lock(ScoreLockRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $this->service->submitScoresLock(
+            (int) $payload['class_section_id'],
+            (string) $payload['semester'],
+            (string) $payload['school_year'],
+            $payload['missing_ok'] ?? [],
+            (int) (auth()->id() ?? 0)
+        );
+
+        return response()->json(['ok' => true]);
+    }
+
+    public function studentScores(ScoreStudentRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $parentId = (int) (auth()->id() ?? 0);
+
+        $data = $this->service->viewStudentScores($parentId, (string) $payload['school_year']);
+
+        return response()->json(['ok' => true] + $data);
+    }
+}
diff --git a/app/Http/Controllers/Api/Scores/ScorePredictorController.php b/app/Http/Controllers/Api/Scores/ScorePredictorController.php
new file mode 100644
index 00000000..1f69533e
--- /dev/null
+++ b/app/Http/Controllers/Api/Scores/ScorePredictorController.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\Api\Scores;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Scores\ScorePredictorRequest;
+use App\Http\Resources\Scores\ScorePredictorStudentResource;
+use App\Services\Scores\ScorePredictorService;
+use Illuminate\Http\JsonResponse;
+
+class ScorePredictorController extends BaseApiController
+{
+    public function __construct(private ScorePredictorService $service)
+    {
+        parent::__construct();
+    }
+
+    public function index(ScorePredictorRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $data = $this->service->report(
+            $payload['school_year'] ?? null,
+            isset($payload['class_section_id']) ? (int) $payload['class_section_id'] : null
+        );
+
+        return response()->json([
+            'ok' => true,
+            'students' => ScorePredictorStudentResource::collection($data['students'] ?? []),
+            'school_year' => $data['school_year'] ?? null,
+            'class_sections' => $data['class_sections'] ?? [],
+            'selected_class_section_id' => $data['selected_class_section_id'] ?? null,
+            'semester' => $data['semester'] ?? null,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/System/SemesterRangeController.php b/app/Http/Controllers/Api/System/SemesterRangeController.php
new file mode 100644
index 00000000..eca196d3
--- /dev/null
+++ b/app/Http/Controllers/Api/System/SemesterRangeController.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Http\Controllers\Api\System;
+
+use App\Http\Controllers\Api\BaseApiController;
+use App\Http\Requests\Semesters\SchoolYearRangeRequest;
+use App\Http\Requests\Semesters\SemesterNormalizeRequest;
+use App\Http\Requests\Semesters\SemesterRangeRequest;
+use App\Http\Requests\Semesters\SemesterResolveRequest;
+use App\Http\Resources\Semesters\SemesterRangeResource;
+use App\Http\Resources\Semesters\SemesterResolveResource;
+use App\Services\SemesterRangeService;
+use Illuminate\Http\JsonResponse;
+
+class SemesterRangeController extends BaseApiController
+{
+    public function __construct(private SemesterRangeService $service)
+    {
+        parent::__construct();
+    }
+
+    public function schoolYearRange(SchoolYearRangeRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        [$start, $end] = $this->service->getSchoolYearRange($payload['school_year']);
+
+        return response()->json([
+            'ok' => true,
+            'school_year' => $payload['school_year'],
+            'range' => new SemesterRangeResource([
+                'start_date' => $start,
+                'end_date' => $end,
+            ]),
+        ]);
+    }
+
+    public function semesterRange(SemesterRangeRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $range = $this->service->getSemesterRange($payload['school_year'], $payload['semester']);
+
+        if ($range === null) {
+            return response()->json(['ok' => false, 'message' => 'Invalid semester range.'], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'school_year' => $payload['school_year'],
+            'semester' => $this->service->normalizeSemester($payload['semester']),
+            'range' => new SemesterRangeResource([
+                'start_date' => $range[0],
+                'end_date' => $range[1],
+            ]),
+        ]);
+    }
+
+    public function normalize(SemesterNormalizeRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+
+        return response()->json([
+            'ok' => true,
+            'normalized' => $this->service->normalizeSemester($payload['semester']),
+        ]);
+    }
+
+    public function resolve(SemesterResolveRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $semester = $this->service->getSemesterForDate($payload['date'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'resolution' => new SemesterResolveResource([
+                'date' => $payload['date'] ?? null,
+                'semester' => $semester,
+            ]),
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php
new file mode 100644
index 00000000..8ccd2c6c
--- /dev/null
+++ b/app/Http/Controllers/Api/UserController.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Requests\Users\LoginActivityRequest;
+use App\Http\Requests\Users\UserListRequest;
+use App\Http\Requests\Users\UserStoreRequest;
+use App\Http\Requests\Users\UserUpdateRequest;
+use App\Http\Resources\Users\LoginActivityResource;
+use App\Http\Resources\Users\UserWithRolesResource;
+use App\Services\Users\LoginActivityService;
+use App\Services\Users\UserListService;
+use App\Services\Users\UserManagementService;
+use Illuminate\Http\JsonResponse;
+
+class UserController extends BaseApiController
+{
+    public function __construct(
+        private UserListService $listService,
+        private UserManagementService $managementService,
+        private LoginActivityService $loginActivityService
+    ) {
+        parent::__construct();
+    }
+
+    public function index(UserListRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $users = $this->listService->list($payload['sort'] ?? null, $payload['order'] ?? null);
+
+        return response()->json([
+            'ok' => true,
+            'users' => UserWithRolesResource::collection($users),
+        ]);
+    }
+
+    public function store(UserStoreRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->managementService->create($payload, (int) (auth()->id() ?? 0));
+
+        if (empty($result['ok'])) {
+            return response()->json([
+                'ok' => false,
+                'message' => $result['message'] ?? 'Failed to create user.',
+            ], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+            'user_id' => $result['user']->id ?? null,
+        ], 201);
+    }
+
+    public function update(UserUpdateRequest $request, int $userId): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->managementService->update($userId, $payload);
+
+        if (empty($result['ok'])) {
+            return response()->json([
+                'ok' => false,
+                'message' => $result['message'] ?? 'Failed to update user.',
+            ], 422);
+        }
+
+        return response()->json([
+            'ok' => true,
+        ]);
+    }
+
+    public function destroy(int $userId): JsonResponse
+    {
+        $result = $this->managementService->delete($userId);
+
+        if (empty($result['ok'])) {
+            return response()->json([
+                'ok' => false,
+                'message' => $result['message'] ?? 'Failed to delete user.',
+            ], 404);
+        }
+
+        return response()->json([
+            'ok' => true,
+        ]);
+    }
+
+    public function loginActivity(LoginActivityRequest $request): JsonResponse
+    {
+        $payload = $request->validated();
+        $result = $this->loginActivityService->list(
+            (int) ($payload['per_page'] ?? 25),
+            (int) ($payload['page'] ?? 1)
+        );
+
+        return response()->json([
+            'ok' => true,
+            'activities' => LoginActivityResource::collection($result['activities']),
+            'pagination' => $result['pagination'],
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/old/ApiClient.php b/app/Http/Controllers/old/ApiClient.php
new file mode 100644
index 00000000..8dc3ae8a
--- /dev/null
+++ b/app/Http/Controllers/old/ApiClient.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Services;
+
+use CodeIgniter\HTTP\CURLRequest;
+use Config\Api as ApiConfig;
+
+class ApiClient
+{
+    protected CURLRequest $http;
+    protected ApiConfig $config;
+
+    public function __construct(CURLRequest $http, ApiConfig $config)
+    {
+        $this->http = $http;
+        $this->config = $config;
+    }
+
+    public function get(string $uri, array $query = [], array $headers = []): array
+    {
+        return $this->request('get', $uri, [
+            'headers' => $this->mergeHeaders($headers),
+            'query'   => $query,
+        ]);
+    }
+
+    public function post(string $uri, array $data = [], array $headers = []): array
+    {
+        return $this->request('post', $uri, [
+            'headers' => $this->mergeHeaders($headers, ['Content-Type' => 'application/json']),
+            'json'    => $data,
+        ]);
+    }
+
+    public function put(string $uri, array $data = [], array $headers = []): array
+    {
+        return $this->request('put', $uri, [
+            'headers' => $this->mergeHeaders($headers, ['Content-Type' => 'application/json']),
+            'json'    => $data,
+        ]);
+    }
+
+    public function delete(string $uri, array $data = [], array $headers = []): array
+    {
+        return $this->request('delete', $uri, [
+            'headers' => $this->mergeHeaders($headers, ['Content-Type' => 'application/json']),
+            'json'    => $data,
+        ]);
+    }
+
+    /**
+     * Low-level access for uncommon HTTP methods or options
+     */
+    public function request(string $method, string $uri, array $options = []): array
+    {
+        $url = $this->fullUrl($uri);
+        $options['timeout'] = $options['timeout'] ?? $this->config->timeout;
+
+        $response = $this->http->request(strtoupper($method), $url, $options);
+
+        $status = $response->getStatusCode();
+        $body   = (string) $response->getBody();
+
+        $decoded = null;
+        if ($this->isJson($body)) {
+            $decoded = json_decode($body, true);
+        }
+
+        return [
+            'ok'        => $status >= 200 && $status < 300,
+            'status'    => $status,
+            'headers'   => $response->getHeaderLine('Content-Type'),
+            'data'      => $decoded,
+            'raw'       => $decoded === null ? $body : null,
+        ];
+    }
+
+    protected function fullUrl(string $uri): string
+    {
+        if (preg_match('#^https?://#i', $uri)) {
+            return $uri;
+        }
+
+        $base = rtrim($this->config->baseURL ?? '', '/');
+        if ($base === '') {
+            return '/' . ltrim($uri, '/');
+        }
+        return $base . '/' . ltrim($uri, '/');
+    }
+
+    protected function mergeHeaders(array $override = [], array $extra = []): array
+    {
+        $base = $this->config->defaultHeaders ?? [];
+        return array_filter(array_merge($base, $extra, $override), static function ($v) {
+            return $v !== null && $v !== '';
+        });
+    }
+
+    protected function isJson(string $string): bool
+    {
+        json_decode($string);
+        return json_last_error() === JSON_ERROR_NONE;
+    }
+}
+
+?>
+
diff --git a/app/Http/Controllers/old/BroadcastEmailController.php b/app/Http/Controllers/old/BroadcastEmailController.php
deleted file mode 100644
index bdeab9d7..00000000
--- a/app/Http/Controllers/old/BroadcastEmailController.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\UserModel;
-use App\Services\EmailService;
-
-class BroadcastEmailController extends BaseController
-{
-    protected UserModel $userModel;
-    protected EmailService $mailer;
-
-    public function __construct()
-    {
-        $this->userModel = new UserModel();
-        $this->mailer    = new EmailService(); // use your existing mailer unmodified
-    }
-
-    public function index()
-    {
-        helper(['form']);
-
-        // Parents via your role-based function
-        $parents = $this->userModel->getParents();
-        $parents = array_values(array_filter($parents, static fn($p) => !empty($p['email'])));
-
-        // Sender list from MAIL_SENDERS directly (no change to EmailService)
-        $fromOptions = $this->senderOptionsFromEnv();
-
-        return view('administrator/broadcast_email', [
-            'parents'     => $parents,
-            'fromOptions' => $fromOptions, // [['key'=>'general','label'=>'Al Rahma Office <office@...>'], ...]
-        ]);
-    }
-
-    public function send()
-    {
-        helper(['form']);
-
-        if (strtolower($this->request->getMethod()) !== 'post') {
-            return redirect()->to(site_url('admin/broadcast-email'));
-        }
-
-        $isTestOnly = $this->request->getPost('send_test_only') !== null;
-
-        $mode      = (string) $this->request->getPost('mode'); // 'personalized' | 'standard'
-        $subject   = trim((string) $this->request->getPost('subject'));
-        $fromKey   = trim((string) $this->request->getPost('from_key') ?: 'general');
-        $body      = (string) $this->request->getPost('body_html');
-        $body      = $this->sanitizeEmailHtml($body);
-
-
-        // Layout options
-        $wrapLayout = (bool) $this->request->getPost('wrap_layout');
-        $preheader  = (string) ($this->request->getPost('preheader') ?? '');
-        $ctaText    = (string) ($this->request->getPost('cta_text') ?? '');
-        $ctaUrl     = (string) ($this->request->getPost('cta_url') ?? '');
-
-        $testEmail  = trim((string) $this->request->getPost('test_email'));
-
-        if ($subject === '' || $body === '') {
-            return redirect()->back()->withInput()->with('error', 'Subject and Body are required.');
-        }
-
-        $isPersonalized = ($mode === 'personalized');
-
-        // --- TEST ONLY ---
-        if ($isTestOnly) {
-            if ($testEmail === '') {
-                return redirect()->back()->withInput()->with('error', 'Provide a test email address.');
-            }
-
-            $recipientName = 'Parent';
-            $html = $this->composeEmailHtml(
-                $wrapLayout,
-                $subject,
-                $body,
-                $recipientName,
-                $preheader,
-                $ctaText,
-                $ctaUrl,
-                $isPersonalized
-            );
-
-            $ok = $this->mailer->send($testEmail, '[TEST] ' . $subject, $html, $fromKey);
-            return redirect()->back()->with(
-                $ok ? 'message' : 'error',
-                $ok ? "Test email sent to {$testEmail}." : "Test email failed (mailer->send() returned false). Check logs."
-            );
-        }
-
-        // --- BROADCAST ---
-        $rawIds = (array) ($this->request->getPost('parent_ids') ?? []);
-        $ids    = [];
-        foreach ($rawIds as $v) {
-            if (is_string($v) && strpos($v, ',') !== false) {
-                $ids = array_merge($ids, array_map('intval', explode(',', $v)));
-            } else {
-                $ids[] = (int) $v;
-            }
-        }
-        $ids = array_values(array_unique(array_filter($ids)));
-
-        if (empty($ids)) {
-            return redirect()->back()->withInput()->with('error', 'Please select at least one parent.');
-        }
-
-        $rows = model(\App\Models\UserModel::class)
-            ->select('users.id, users.email, CONCAT(users.firstname, " ", users.lastname) AS name')
-            ->whereIn('users.id', $ids)
-            ->where('users.email IS NOT NULL AND users.email != ""')
-            ->findAll();
-
-        if (empty($rows)) {
-            return redirect()->back()->withInput()->with('error', 'No valid parent emails found.');
-        }
-
-        $stats = ['attempted' => 0, 'sent' => 0, 'failed' => 0, 'mode' => $mode];
-
-        foreach ($rows as $r) {
-            $stats['attempted']++;
-            $recipientName = $r['name'] ?: 'Parent';
-
-            $html = $this->composeEmailHtml(
-                $wrapLayout,
-                $subject,
-                $body,
-                $recipientName,
-                $preheader,
-                $ctaText,
-                $ctaUrl,
-                $isPersonalized
-            );
-
-            $ok = $this->mailer->send($r['email'], $subject, $html, $fromKey);
-            $ok ? $stats['sent']++ : $stats['failed']++;
-        }
-
-        $msg = "Broadcast finished. Mode: {$stats['mode']}. Sent: {$stats['sent']}/{$stats['attempted']}. Failures: {$stats['failed']}.";
-        return redirect()->to(site_url('admin/broadcast-email'))
-            ->with($stats['failed'] > 0 ? 'error' : 'message', $msg);
-    }
-
-
-    /**
-     * Build HTML: optionally wrap $body inside your view('layout/email_layout', ...).
-     */
-    private function composeEmailHtml(
-        bool $wrap,
-        string $subject,
-        string $body,
-        string $recipientName,
-        string $preheader = '',
-        string $ctaText = '',
-        string $ctaUrl = '',
-        bool $doPersonalize = true
-    ): string {
-        $content = $doPersonalize ? str_replace('{{name}}', $recipientName, $body) : $body;
-
-        if (!$wrap) {
-            return $content; // raw body
-        }
-
-        // Render a CHILD view that defines the section your layout expects
-        return view('emails/broadcast_wrapper', [
-            'subject'   => $subject,
-            'content'   => $content,
-            // pass more if you later wire them in your layout
-            'preheader' => $preheader,
-            'cta_text'  => $ctaText,
-            'cta_url'   => $ctaUrl,
-        ]);
-    }
-
-
-    private function sanitizeEmailHtml(string $html): string
-    {
-        // Remove <script> and <iframe> blocks (cheap and effective for admin inputs)
-        $html = preg_replace('#<(script|iframe)[^>]*>.*?</\1>#is', '', $html);
-        // Optionally strip on* event handlers (onclick, etc.)
-        $html = preg_replace('/\son\w+="[^"]*"/i', '', $html);
-        $html = preg_replace("/\son\w+='[^']*'/i", '', $html);
-        return $html;
-    }
-
-
-
-    /**
-     * Read MAIL_SENDERS from .env so we don’t need changes in EmailService.
-     * Returns [['key' => 'general', 'label' => 'Al Rahma Office <office@...>'], ...]
-     */
-    private function senderOptionsFromEnv(): array
-    {
-        $json = env('MAIL_SENDERS', '{}');
-        $arr  = json_decode($json, true);
-        if (!is_array($arr) || empty($arr)) {
-            // Fallback to SMTP_USER as a single "general" option
-            $smtpUser = getenv('SMTP_USER') ?: '';
-            $name     = 'Al Rahma Sunday School';
-            return [['key' => 'general', 'label' => $name . ($smtpUser ? " <{$smtpUser}>" : '')]];
-        }
-
-        $out = [];
-        foreach ($arr as $key => $info) {
-            $nm = $info['name']  ?? 'Sender';
-            $em = $info['email'] ?? '';
-            $out[] = ['key' => (string)$key, 'label' => trim($nm . ($em ? " <{$em}>" : ''))];
-        }
-        return $out;
-    }
-
-public function uploadImage()
-{
-    if (strtolower($this->request->getMethod()) !== 'post') {
-        return $this->response->setStatusCode(405)->setJSON(['success' => false, 'error' => 'Method not allowed']);
-    }
-
-    $file = $this->request->getFile('image');
-    if (!$file || !$file->isValid()) {
-        return $this->response->setStatusCode(400)->setJSON(['success' => false, 'error' => 'No image uploaded']);
-    }
-
-    $mime = strtolower((string) $file->getMimeType());
-    $allowed = ['image/jpeg' => 'jpg', 'image/png' => 'png', 'image/gif' => 'gif', 'image/webp' => 'webp'];
-    if (!isset($allowed[$mime])) {
-        return $this->response->setStatusCode(415)->setJSON(['success' => false, 'error' => 'Unsupported image type']);
-    }
-    if ($file->getSize() > 5 * 1024 * 1024) {
-        return $this->response->setStatusCode(413)->setJSON(['success' => false, 'error' => 'Image too large (max 5MB)']);
-    }
-
-    $targetDir = rtrim(FCPATH, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'uploads' . DIRECTORY_SEPARATOR . 'email';
-    if (!is_dir($targetDir)) {
-        @mkdir($targetDir, 0755, true);
-    }
-
-    $ext     = $allowed[$mime];
-    $newName = uniqid('em_', true) . '.' . $ext;
-    $file->move($targetDir, $newName, true);
-
-    helper('url');
-    $url = base_url('uploads/email/' . $newName);
-
-    // 👈 send the rotated token back both in JSON and a response header
-    $newHash = function_exists('csrf_hash') ? csrf_hash() : null;
-    return $this->response
-        ->setHeader('X-CSRF-HASH', (string) $newHash)
-        ->setJSON([
-            'success'   => true,
-            'url'       => $url,
-            'csrf_hash' => $newHash,
-        ]);
-}
-
-}
diff --git a/app/Http/Controllers/old/ClassPrepController.php b/app/Http/Controllers/old/ClassPrepController.php
deleted file mode 100644
index d8377773..00000000
--- a/app/Http/Controllers/old/ClassPrepController.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-class ClassPrepController extends PrintablesBaseController
-{
-    // Compute per-student sticker counts for entire schoolYear (optionally semester).
-    protected function computeStickerCountsAll(\CodeIgniter\Database\BaseConnection $db, string $schoolYear, ?string $semester = null): array
-    {
-        return $this->computeStickerCounts($schoolYear, null, $semester);
-    }
-
-    // Compute per-student sticker counts for one class section.
-    protected function computeStickerCountsForClass(\CodeIgniter\Database\BaseConnection $db, string $schoolYear, int $classSectionId, ?string $semester = null): array
-    {
-        return $this->computeStickerCounts($schoolYear, $classSectionId, $semester);
-    }
-
-    protected function computeStickerCounts(
-        string $schoolYear,
-        ?int $classSectionId,
-        ?string $semester
-    ): array {
-        $specialMap   = ['KG' => 1, '1-A' => 3, '1-B' => 4, '2-A' => 5, '2-B' => 5, '9' => 2];
-        $isUpperBlock = static fn(string $g) => (bool) preg_match('/^(3|4|5|6|7|8)(-[AB])?$/', trim($g));
-        $isGrade5     = static fn(string $g) => (bool) preg_match('/^5(\-|$)/', trim($g));
-
-        $b = $this->db->table('student_class sc')
-            ->select('sc.student_id, s.firstname, s.lastname, s.is_new, cs.class_section_name AS grade_label')
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->join('classSection cs', 'cs.class_section_id = sc.class_section_id', 'inner')
-            ->join('classes c', 'c.id = cs.class_id', 'inner')
-            ->where('sc.school_year', $schoolYear);
-
-        if (!empty($classSectionId)) {
-            $b->where('sc.class_section_id', $classSectionId);
-        }
-
-        $rows = $b->get()->getResultArray();
-
-        // Exclude Youth and KG (case-insensitive; also ignore variants like youth-*, KG-*)
-        $rows = array_values(array_filter($rows, static function ($r) {
-            $g = trim((string) $r['grade_label']);
-            return $g !== ''
-                && !preg_match('/^youth(?:\b|-)/i', $g)
-                && !preg_match('/^kg(?:\b|-)/i', $g);
-        }));
-
-        $students = [];
-        $total    = 0;
-
-        foreach ($rows as $r) {
-            $g     = trim((string) $r['grade_label']);
-            $isNew = ((int) $r['is_new']) === 1;
-
-            // Primary-only rules
-            if (array_key_exists($g, $specialMap)) {
-                $p = $specialMap[$g];
-            } elseif ($isUpperBlock($g)) {
-                $p = $isNew ? 4 : ($isGrade5($g) ? 3 : 2);
-            } else {
-                $p = 4;
-            }
-
-            $total += $p;
-
-            $students[] = [
-                'student_id'    => (int) $r['student_id'],
-                'firstname'     => trim($r['firstname']),
-                'lastname'      => trim($r['lastname']),
-                'grade_label'   => $g,
-                'primary_count' => $p,
-            ];
-        }
-
-        return [
-            'students' => $students,
-            'totals'   => [
-                'stickers' => $total,
-                'students' => count($students),
-            ],
-        ];
-    }
-
-    /**
-     * Compute sticker counts per student (no file I/O).
-     *
-     * @param BaseConnection $db
-     * @param string         $schoolYear e.g. "2025-2026"
-     * @param string|null    $semester   e.g. "Fall" (optional filter)
-     * @return array{
-     *   students: array<int, array{
-     *     student_id:int,
-     *     firstname:string,
-     *     lastname:string,
-     *     grade_label:string,
-     *     primary_count:int,
-     *     secondary_count:int
-     *   }>,
-     *   totals: array{primary:int, secondary:int, students:int}
-     * }
-     */
-    private function getStickerCountsPerStudent(string $schoolYear, ?string $semester = null): array
-    {
-        // --- Sticker rules helpers ----------------------------------------------
-        $specialMap = [
-            'KG' => 1,
-            '1-A' => 3,
-            '1-B' => 4,
-            '2-A' => 5,
-            '2-B' => 5,
-            '9'   => 2,
-        ];
-        $isUpperBlock = static function (string $g): bool {
-            // 3-A, 3-B, 4-A, 4-B, 5-A, 5-B, 6, 7, 8 (also allow plain 3/4/5/6/7/8)
-            return (bool) preg_match('/^(3|4|5|6|7|8)(-[AB])?$/', trim($g));
-        };
-        $isGrade5 = static function (string $g): bool {
-            // "5" OR "5-A"/"5-B"
-            return (bool) preg_match('/^5(\-|$)/', trim($g));
-        };
-
-        // --- Pull roster: student_class -> classSection -> classes -> students ---
-        $builder = $this->db->table('student_class sc')
-            ->select([
-                'sc.student_id',
-                's.firstname',
-                's.lastname',
-                's.is_new',
-                'cs.class_section_name AS grade_label',
-            ])
-            ->join('students s', 's.id = sc.student_id')
-            ->join('classSection cs', 'cs.class_section_id = sc.class_section_id')
-            ->join('classes c', 'c.id = cs.class_id')
-            ->where('sc.school_year', $schoolYear);
-
-
-        $rows = $builder->get()->getResultArray();
-
-        // Filter out Youth (any case; includes youth-*), and empty labels
-        $rows = array_values(array_filter($rows, static function ($r) {
-            $g = trim((string) $r['grade_label']);
-            return $g !== '' && strcasecmp($g, 'youth') !== 0 && strncasecmp($g, 'youth-', 6) !== 0;
-        }));
-
-        $out = [];
-        $totalPrimary = 0;
-        $totalSecondary = 0;
-
-        foreach ($rows as $r) {
-            $first = trim((string) $r['firstname']);
-            $last  = trim((string) $r['lastname']);
-            $grade = trim((string) $r['grade_label']);
-            $isNew = ((int) $r['is_new']) === 1;
-
-            $primary = 0;
-            $secondary = 0;
-
-            // 1) Special fixed grades
-            if (array_key_exists($grade, $specialMap)) {
-                $primary = (int) $specialMap[$grade];
-                $secondary = 0;
-            }
-            // 2) Upper block 3..8
-            elseif ($isUpperBlock($grade)) {
-                if ($isNew) {
-                    $primary = 4;
-                    $secondary = 0;
-                } else {
-                    $primary = $isGrade5($grade) ? 3 : 2;
-                    $secondary = max(0, 4 - $primary);
-                }
-            }
-            // 3) Fallback for other non-Youth labels (e.g., "1", "2", "10", "11")
-            else {
-                $primary = 4;
-                $secondary = 0;
-            }
-
-            $totalPrimary  += $primary;
-            $totalSecondary += $secondary;
-
-            $out[] = [
-                'student_id'     => (int) $r['student_id'],
-                'firstname'      => $first,
-                'lastname'       => $last,
-                'grade_label'    => $grade,
-                'primary_count'  => $primary,
-                'secondary_count' => $secondary,
-            ];
-        }
-
-        return [
-            'students' => $out,
-            'totals' => [
-                'primary'  => $totalPrimary,
-                'secondary' => $totalSecondary,
-                'students' => count($out),
-            ],
-        ];
-    }
-
-    protected function getStickerCountsPerStudentForClass(
-        string $schoolYear,
-        int $classSectionId,
-        ?string $semester = null
-    ): array {
-        // Reuse exact helpers/rules from getStickerCountsPerStudent()
-        $specialMap = [
-            '1-A' => 3,
-            '1-B' => 4,
-            '2-A' => 5,
-            '2-B' => 5,
-            '9' => 2,
-        ];
-        $isUpperBlock = static fn($g) => (bool) preg_match('/^(3|4|5|6|7|8)(-[AB])?$/', trim($g));
-        $isGrade5     = static fn($g) => (bool) preg_match('/^5(\-|$)/', trim($g));
-
-        $b = $this->db->table('student_class sc')
-            ->select('sc.student_id, s.firstname, s.lastname, s.is_new, cs.class_section_name AS grade_label')
-            ->join('students s', 's.id = sc.student_id')
-            ->join('classSection cs', 'cs.class_section_id = sc.class_section_id')
-            ->join('classes c', 'c.id = cs.class_id')
-            ->where('sc.school_year', $schoolYear)
-            ->where('sc.class_section_id', $classSectionId);
-
-
-        $rows = $b->get()->getResultArray();
-
-        $rows = array_values(array_filter($rows, static function ($r) {
-            $g = trim((string) $r['grade_label']);
-            return $g !== '' && strcasecmp($g, 'youth') !== 0 && strncasecmp($g, 'youth-', 6) !== 0;
-        }));
-
-        $out = [];
-        $tp = 0;
-        $ts = 0;
-        foreach ($rows as $r) {
-            $g = trim((string) $r['grade_label']);
-            $isNew = ((int) $r['is_new']) === 1;
-            $p = 0;
-            $s = 0;
-
-            if (isset($specialMap[$g])) {
-                $p = $specialMap[$g];
-            } elseif ($isUpperBlock($g)) {
-                if ($isNew) {
-                    $p = 4;
-                } else {
-                    $p = $isGrade5($g) ? 3 : 2;
-                    $s = max(0, 4 - $p);
-                }
-            } else {
-                $p = 4;
-            }
-
-            $tp += $p;
-            $ts += $s;
-
-            $out[] = [
-                'student_id'      => (int) $r['student_id'],
-                'firstname'       => trim($r['firstname']),
-                'lastname'        => trim($r['lastname']),
-                'grade_label'     => $g,
-                'primary_count'   => $p,
-                'secondary_count' => $s,
-            ];
-        }
-
-        return ['students' => $out, 'totals' => ['primary' => $tp, 'secondary' => $ts, 'students' => count($out)]];
-    }
-
-    public function previewStickerCounts()
-    {
-        // Optional: allow class_id filter; if present, preview only that class
-        $classId = (int) ($this->request->getGet('class_id') ?? 0);
-
-        if ($classId > 0) {
-            // same join as getStickerCountsPerStudent but add class filter
-            $result = $this->getStickerCountsPerStudentForClass($this->schoolYear, $classId, $this->semester);
-        } else {
-            // whole school year
-            $result = $this->getStickerCountsPerStudent($this->schoolYear, $this->semester);
-        }
-
-        return $this->response->setJSON([
-            'status' => 'ok',
-            'data'   => $result
-        ]);
-    }
-
-    public function studentsByClass(int $classSectionId)
-    {
-        $rows = $this->studentModel
-            ->select('students.id, students.firstname, students.lastname, students.gender, cs.class_section_name AS registration_grade')
-            ->join('student_class sc', 'sc.student_id = students.id', 'inner')
-            ->join('classSection cs', 'cs.class_section_id = sc.class_section_id', 'inner')
-            ->where('sc.school_year', $this->schoolYear)
-            ->where('sc.class_section_id', $classSectionId)
-            ->groupBy('students.id, students.firstname, students.lastname, students.gender, cs.class_section_name')
-            ->orderBy('students.firstname', 'ASC')
-            ->orderBy('students.lastname', 'ASC')
-            ->findAll(1000);
-
-        return $this->response->setJSON($rows);
-    }
-}
diff --git a/app/Http/Controllers/old/ClassPreparationController.php b/app/Http/Controllers/old/ClassPreparationController.php
deleted file mode 100644
index db9456e5..00000000
--- a/app/Http/Controllers/old/ClassPreparationController.php
+++ /dev/null
@@ -1,616 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\StudentClassModel;
-use App\Models\ClassPreparationLogModel;
-use App\Models\ConfigurationModel;
-use App\Models\ClassSectionModel;
-use App\Models\ClassPrepAdjustmentModel;
-use App\Models\UserModel;
-
-class ClassPreparationController extends BaseController
-{
-    protected $studentClassModel;
-    protected $prepLogModel;
-    protected $classSectionModel;
-    protected $configModel;
-    protected $userModel;
-    protected $db;
-    protected $schoolYear;
-    protected $semester;
-    protected $adjustmentModel;
-    /** cache for roster presence per term */
-    private array $rosterPresenceCache = [];
-    // Inside ClassPreparationController (class scope, not inside a method)
-    private array $allowedPrepCategories = [
-        'Grade Box',
-        'Large Table',
-        'Regular Chair',
-        'Small Chair',
-        'Small Table',
-        'Teacher Chair',
-        'Trash Bin',
-        'White Board',
-    ];
-
-
-    public function __construct()
-    {
-        $this->studentClassModel = new StudentClassModel();
-        $this->prepLogModel      = new ClassPreparationLogModel();
-        $this->classSectionModel = new ClassSectionModel();
-        $this->configModel = new ConfigurationModel();
-        $this->adjustmentModel = new ClassPrepAdjustmentModel();
-
-        $this->userModel = new UserModel();
-        $this->db = \Config\Database::connect();
-
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-    }
-
-    public function index()
-    {
-        $schoolYear = (string)($this->request->getGet('school_year') ?? $this->schoolYear);
-        $semParam   = $this->request->getGet('semester');
-        $semester   = (is_string($semParam) && $semParam !== '') ? (string)$semParam : (string)$this->semester;
-        $allowed    = $this->allowedPrepCategories;
-        $limitToSemester = $this->hasRosterForSemester($schoolYear, $semester);
-
-        // 1) Get student count per class-section (distinct students, correct semester)
-        $scQ = $this->db->table('student_class sc')
-            ->select('sc.class_section_id, COUNT(DISTINCT sc.student_id) AS student_count', false)
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->where('s.is_active', 1)
-            ->where('sc.school_year', $schoolYear);
-        if ($limitToSemester && $semester !== '') {
-            $scQ->where('sc.semester', $semester);
-        }
-        $classSections = $scQ->groupBy('sc.class_section_id')->get()->getResultArray();
-
-        // 2) Inventory availability — prefer good_qty when present, else condition='good' quantity.
-        $inventoryMap = $this->buildInventoryAvailability($schoolYear, $semester, $limitToSemester, $allowed);
-
-        // Seed totals with allowed categories for stable ordering
-        $requiredTotals = array_fill_keys($allowed, 0);
-        $prepResults    = [];
-
-        // 3) Build prep per section (once!)
-        foreach ($classSections as $section) {
-            $classSectionId = $section['class_section_id'];
-            $studentCount   = (int)$section['student_count'];
-            $classLevel     = $this->getClassLevelBySection($classSectionId);
-            $className      = $this->classSectionModel->getClassSectionNameBySectionId($classSectionId);
-
-            // Calculate required items (whitelist inside)
-            $baseItems = $this->calculatePrepItems($studentCount, $classLevel, $classSectionId);
-
-            // --- Apply adjustments (only Small/Large Table), clamp >= 0 ---
-            $rawAdjustments = $this->adjustmentModel
-                ->where('class_section_id', $classSectionId)
-                ->where('school_year', $schoolYear)
-                ->where('adjustable', 1)
-                ->findAll();
-
-            $adjMap = ['Large Table' => 0, 'Small Table' => 0];
-
-            foreach ($rawAdjustments as $a) {
-                $item  = $a['item_name'];
-                $delta = (int)$a['adjustment'];
-
-                if (array_key_exists($item, $adjMap)) {
-                    $adjMap[$item] = $delta;
-                }
-
-                if (isset($baseItems[$item])) {
-                    $baseItems[$item] = max(0, (int)$baseItems[$item] + $delta);
-                } elseif (in_array($item, $allowed, true)) {
-                    $baseItems[$item] = max(0, $delta);
-                }
-            }
-
-            // 4) Accumulate global totals (allowed only)
-            foreach ($allowed as $cat) {
-                $requiredTotals[$cat] += (int)($baseItems[$cat] ?? 0);
-            }
-
-            // 5) Compare with last snapshot; do not save here — only on print or explicit API
-            $oldSnap = $this->prepLogModel
-                ->where('class_section_id', $classSectionId)
-                ->where('school_year', $schoolYear)
-                ->orderBy('created_at', 'DESC')
-                ->first();
-
-            $oldPrep    = $oldSnap ? json_decode($oldSnap['prep_data'], true) : [];
-            $hasChanged = $this->hasPrepChanged($baseItems, $oldPrep);
-
-            // 6) Push exactly ONCE
-            $prepResults[] = [
-                'class_section'    => $className,
-                'class_section_id' => $classSectionId,
-                'student_count'    => $studentCount,
-                'class_level'      => $classLevel,
-                'prep_items'       => $baseItems,
-                'needs_print'      => $hasChanged,
-                'last_printed_at'  => $oldSnap['created_at'] ?? null,
-                'adjustments'      => $adjMap,
-            ];
-        }
-
-        // 7) Shortages (compare totals vs inventory)
-        $shortages = [];
-        foreach ($requiredTotals as $item => $reqQty) {
-            $have = (int)($inventoryMap[$item] ?? 0);
-            if ($have < (int)$reqQty) {
-                $shortages[$item] = (int)$reqQty - $have;
-            }
-        }
-
-        return view('class_prep/list', [
-            'prepResults' => $prepResults,
-            'schoolYear'  => $schoolYear,
-            'semester'    => $semester,
-            'shortages'   => $shortages,
-            'totalNeeded' => $requiredTotals,
-            'available'   => $inventoryMap,
-            // For temporary debugging, you can pass these too:
-            // 'joinGood' => $joinGood, 'nameGood' => $nameGood, 'joinCond' => $joinCond, 'nameCond' => $nameCond,
-        ]);
-    }
-
-    private function getTeacherCountForSection(string $classSectionId, ?string $schoolYear = null): int
-    {
-        $schoolYear = $schoolYear ?? $this->schoolYear;
-
-        // positions: 'main' and 'ta' (per your new schema)
-        $row = $this->db->table('teacher_class')
-            ->select('COUNT(*) AS cnt')
-            ->where('class_section_id', $classSectionId)
-            ->whereIn('position', ['main', 'ta'])
-            ->where('school_year', $schoolYear)
-            ->get()->getRowArray();
-
-        return (int)($row['cnt'] ?? 0);
-    }
-
-    private function calculatePrepItems(int $students, int $classLevel, string $classSectionId): array
-    {
-        // 1) Stable keys: your whitelist, all zero to start
-        $allowed = $this->allowedPrepCategories;
-        $items   = array_fill_keys($allowed, 0);
-
-        // 2) Fetch only the classroom categories you care about (optionally with grade bounds)
-        $categories = $this->db->table('inventory_categories')
-            ->select('name, grade_min, grade_max')
-            ->where('type', 'classroom')
-            ->whereIn('name', $allowed)
-            ->orderBy('name')
-            ->get()
-            ->getResultArray();
-
-        // 3) Rules
-        $isLowerGrades = in_array($classLevel, [1, 2], true);
-        $teacherCount  = $this->getTeacherCountForSection($classSectionId, $this->schoolYear);
-
-        foreach ($categories as $cat) {
-            $name     = $cat['name'];      // e.g., 'Small Table'
-            $gradeMin = $cat['grade_min']; // may be null
-            $gradeMax = $cat['grade_max']; // may be null
-
-            // Respect optional bounds
-            if ($gradeMin !== null && $classLevel < (int)$gradeMin) {
-                $items[$name] = 0;
-                continue;
-            }
-            if ($gradeMax !== null && $classLevel > (int)$gradeMax) {
-                $items[$name] = 0;
-                continue;
-            }
-
-            $qty = 0;
-            switch (strtolower($name)) {
-                case 'small table':
-                    $qty = $isLowerGrades ? (int)ceil($students / 3) : 0;
-                    break;
-                case 'large table':
-                    $qty = $isLowerGrades ? 0 : (int)ceil($students / 4);
-                    break;
-                case 'small chair':
-                    $qty = $isLowerGrades ? $students : 0;
-                    break;
-                case 'regular chair':
-                    $qty = $isLowerGrades ? 0 : $students;
-                    break;
-                case 'teacher chair':
-                    $qty = (int)$teacherCount;
-                    break;
-                case 'trash bin':
-                case 'white board':
-                case 'grade box':
-                    $qty = 1;
-                    break;
-                default:
-                    $qty = 0;
-            }
-
-            // Only set for allowed keys (guards against unexpected DB rows)
-            if (array_key_exists($name, $items)) {
-                $items[$name] = $qty;
-            }
-        }
-
-        return $items;
-    }
-
-
-    public function saveAdjustment()
-    {
-        $data = $this->request->getPost();
-        $sectionId = $data['class_section_id'];
-        $schoolYear = $data['school_year'];
-        $adjustments = $data['adjustments'] ?? [];
-
-        foreach ($adjustments as $itemName => $adjustment) {
-            $row = $this->adjustmentModel
-                ->where('class_section_id', $sectionId)
-                ->where('school_year', $schoolYear)
-                ->where('item_name', $itemName)
-                ->first();
-
-            if ($row) {
-                // Update
-                $this->adjustmentModel->update($row['id'], ['adjustment' => (int)$adjustment, 'adjustable' => 1]);
-            } else {
-                // Insert
-                $this->adjustmentModel->insert([
-                    'class_section_id' => $sectionId,
-                    'item_name'        => $itemName,
-                    'adjustment'       => (int)$adjustment,
-                    'school_year'      => $schoolYear,
-                    'adjustable'       => 1,
-                ]);
-            }
-        }
-
-        return redirect()->to(site_url('class-prep?school_year=' . urlencode($schoolYear)))
-            ->with('success', 'Adjustments saved successfully.');
-    }
-
-
-
-    /* ---------- helpers ---------- */
-
-    private function hasPrepChanged(array $new, array $old): bool
-    {
-        ksort($new);
-        ksort($old);
-
-        return json_encode($new) !== json_encode($old);
-    }
-
-    public function print($classSectionId, $schoolYear)
-    {
-        $semParam = $this->request->getGet('semester');
-        $semester = (is_string($semParam) && $semParam !== '') ? (string) $semParam : (string) $this->semester;
-        $limitToSemester = $this->hasRosterForSemester((string) $schoolYear, $semester);
-
-        // Friendly label (if you have this helper)
-        $className = $this->classSectionModel->getClassSectionNameBySectionId($classSectionId) ?? $classSectionId;
-
-        // Distinct student count for this term
-        $studentQ = $this->db->table('student_class sc')
-            ->select('COUNT(DISTINCT sc.student_id) AS cnt', false)
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->where('s.is_active', 1)
-            ->where('sc.class_section_id', $classSectionId)
-            ->where('sc.school_year', $schoolYear);
-        if ($limitToSemester && $semester !== '') {
-            $studentQ->where('sc.semester', $semester);
-        }
-        $studentRow = $studentQ->get()->getRowArray();
-        $studentCount = (int)($studentRow['cnt'] ?? 0);
-
-        // Live calc + adjustments
-        $classLevel = $this->getClassLevelBySection((string)$classSectionId);
-        $items      = $this->calculatePrepItems($studentCount, $classLevel, (string)$classSectionId);
-
-        $rawAdjustments = $this->adjustmentModel
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->where('adjustable', 1)
-            ->findAll();
-        foreach ($rawAdjustments as $a) {
-            $item  = $a['item_name'];
-            $delta = (int)$a['adjustment'];
-            if (isset($items[$item])) $items[$item] = max(0, (int)$items[$item] + $delta);
-        }
-
-        // Record a snapshot at print time as the new baseline
-        $this->prepLogModel->insert([
-            'class_section_id' => (string)$classSectionId,
-            'class_section'    => $className,
-            'school_year'      => $schoolYear,
-            'prep_data'        => json_encode($items),
-            'created_at'       => utc_now(),
-        ]);
-
-        // Return PRINT view (HTML) that auto-opens the print dialog
-        return view('class_prep/print', [
-            'classSectionId' => $classSectionId,
-            'classSection'   => $className,
-            'schoolYear'     => $schoolYear,
-            'prepItems'      => $items,
-        ]);
-    }
-
-    /**
-     * API: Return class prep data and change flags for all sections in a year.
-     * GET: school_year
-     * Response: { ok, schoolYear, results:[{ class_section_id, class_section, student_count, class_level, prep_items, needs_print, last_printed_at }], totals, shortages }
-     */
-    public function apiList()
-    {
-        $schoolYear = (string)($this->request->getGet('school_year') ?? $this->schoolYear);
-        $semParam   = $this->request->getGet('semester');
-        $semester   = (is_string($semParam) && $semParam !== '') ? (string)$semParam : (string)$this->semester;
-        $allowed    = $this->allowedPrepCategories;
-        $limitToSemester = $this->hasRosterForSemester($schoolYear, $semester);
-
-        // Student counts
-        $scQ = $this->db->table('student_class sc')
-            ->select('sc.class_section_id, COUNT(DISTINCT sc.student_id) AS student_count', false)
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->where('s.is_active', 1)
-            ->where('sc.school_year', $schoolYear);
-        if ($limitToSemester && $semester !== '') {
-            $scQ->where('sc.semester', $semester);
-        }
-        $classSections = $scQ->groupBy('sc.class_section_id')->get()->getResultArray();
-
-        // Build inventory availability maps
-        $inventoryMap = $this->buildInventoryAvailability($schoolYear, $semester, $limitToSemester, $allowed);
-
-        $requiredTotals = array_fill_keys($allowed, 0);
-        $results = [];
-
-        foreach ($classSections as $row) {
-            $classSectionId = (string)$row['class_section_id'];
-            $studentCount   = (int)$row['student_count'];
-            $classLevel     = $this->getClassLevelBySection($classSectionId);
-            $className      = $this->classSectionModel->getClassSectionNameBySectionId($classSectionId);
-
-            $baseItems = $this->calculatePrepItems($studentCount, $classLevel, $classSectionId);
-            $rawAdjustments = $this->adjustmentModel
-                ->where('class_section_id', $classSectionId)
-                ->where('school_year', $schoolYear)
-                ->where('adjustable', 1)
-                ->findAll();
-            $adjMap = ['Large Table' => 0, 'Small Table' => 0];
-            foreach ($rawAdjustments as $a) {
-                $item  = $a['item_name'];
-                $delta = (int)$a['adjustment'];
-                if (array_key_exists($item, $adjMap)) $adjMap[$item] = $delta;
-                if (isset($baseItems[$item])) $baseItems[$item] = max(0, (int)$baseItems[$item] + $delta);
-            }
-
-            foreach ($allowed as $cat) {
-                $requiredTotals[$cat] += (int)($baseItems[$cat] ?? 0);
-            }
-
-            $oldSnap = $this->prepLogModel
-                ->where('class_section_id', $classSectionId)
-                ->where('school_year', $schoolYear)
-                ->orderBy('created_at', 'DESC')
-                ->first();
-            $oldPrep    = $oldSnap ? json_decode($oldSnap['prep_data'], true) : [];
-            $hasChanged = $this->hasPrepChanged($baseItems, $oldPrep);
-
-            $results[] = [
-                'class_section'    => $className,
-                'class_section_id' => $classSectionId,
-                'student_count'    => $studentCount,
-                'class_level'      => $classLevel,
-                'prep_items'       => $baseItems,
-                'needs_print'      => $hasChanged,
-                'last_printed_at'  => $oldSnap['created_at'] ?? null,
-                'adjustments'      => $adjMap,
-            ];
-        }
-
-        // Shortages
-        $shortages = [];
-        foreach ($requiredTotals as $item => $reqQty) {
-            $have = (int)($inventoryMap[$item] ?? 0);
-            if ($have < (int)$reqQty) $shortages[$item] = (int)$reqQty - $have;
-        }
-
-        return $this->response->setJSON([
-            'ok'          => true,
-            'schoolYear'  => $schoolYear,
-            'results'     => $results,
-            'totals'      => $requiredTotals,
-            'shortages'   => $shortages,
-            'csrf_token'  => csrf_token(),
-            'csrf_hash'   => csrf_hash(),
-        ]);
-    }
-
-    /**
-     * API: Mark selected classes as printed (save baseline snapshot).
-     * POST: school_year, class_section_ids[]
-     */
-    public function apiMarkPrinted()
-    {
-        $schoolYear = (string)($this->request->getPost('school_year') ?? $this->schoolYear);
-        $semParam   = $this->request->getPost('semester');
-        $semester   = (is_string($semParam) && $semParam !== '') ? (string)$semParam : (string)$this->semester;
-        $limitToSemester = $this->hasRosterForSemester($schoolYear, $semester);
-        $ids = $this->request->getPost('class_section_ids') ?? [];
-        if (!is_array($ids)) $ids = $ids ? [$ids] : [];
-        $ids = array_values(array_unique(array_filter(array_map('strval', $ids))));
-
-        $now = utc_now();
-        $count = 0;
-        foreach ($ids as $classSectionId) {
-            $studentQ = $this->db->table('student_class sc')
-                ->select('COUNT(DISTINCT sc.student_id) AS cnt', false)
-                ->join('students s', 's.id = sc.student_id', 'inner')
-                ->where('s.is_active', 1)
-                ->where('sc.class_section_id', $classSectionId)
-                ->where('sc.school_year', $schoolYear);
-            if ($limitToSemester && $semester !== '') {
-                $studentQ->where('sc.semester', $semester);
-            }
-            $studentRow = $studentQ->get()->getRowArray();
-            $studentCount = (int)($studentRow['cnt'] ?? 0);
-            $classLevel   = $this->getClassLevelBySection((string)$classSectionId);
-            $className    = $this->classSectionModel->getClassSectionNameBySectionId($classSectionId) ?? $classSectionId;
-
-            $items = $this->calculatePrepItems($studentCount, $classLevel, (string)$classSectionId);
-
-            $rawAdjustments = $this->adjustmentModel
-                ->where('class_section_id', $classSectionId)
-                ->where('school_year', $schoolYear)
-                ->where('adjustable', 1)
-                ->findAll();
-            foreach ($rawAdjustments as $a) {
-                $item  = $a['item_name'];
-                $delta = (int)$a['adjustment'];
-                if (isset($items[$item])) $items[$item] = max(0, (int)$items[$item] + $delta);
-            }
-
-            try {
-                $this->prepLogModel->insert([
-                    'class_section_id' => (string)$classSectionId,
-                    'class_section'    => $className,
-                    'school_year'      => $schoolYear,
-                    'prep_data'        => json_encode($items),
-                    'created_at'       => $now,
-                ]);
-                $count++;
-            } catch (\Throwable $e) {
-                // ignore and continue
-            }
-        }
-
-        return $this->response->setJSON([
-            'ok'         => true,
-            'updated'    => $count,
-            'csrf_token' => csrf_token(),
-            'csrf_hash'  => csrf_hash(),
-        ]);
-    }
-
-
-    private function getClassLevelBySection(string $classSectionId): int
-    {
-        // Prefer the human-readable section name for grade parsing.
-        $sectionName = $this->classSectionModel->getClassSectionNameBySectionId($classSectionId);
-        $label = $sectionName !== null && $sectionName !== '' ? (string) $sectionName : $classSectionId;
-
-        // If it's clearly Kindergarten (KG/K)
-        if (preg_match('/^(kg|k)(\b|[^a-z0-9])/i', $label)) {
-            return 1; // treat Kindergarten as lower grade
-        }
-
-        // Remove non-digits, then infer by leading digit
-        $numValue = (int) preg_replace('/\D/', '', $label);
-
-        if ($numValue > 0 && $numValue < 30) {
-            $firstDigit = (int) substr((string) $numValue, 0, 1);
-            return $firstDigit === 1 ? 1 : ($firstDigit === 2 ? 2 : 3);
-        }
-
-        // Default to upper grades (3+)
-        return 3;
-    }
-
-    /**
-     * Returns true if student_class has any rows for the given school year.
-     * The semester argument is ignored because assignments are tracked per year.
-     */
-    private function hasRosterForTerm(string $schoolYear, string $semester): bool
-    {
-        $year = trim((string)$schoolYear);
-        if ($year === '') {
-            return false;
-        }
-
-        if (array_key_exists($year, $this->rosterPresenceCache)) {
-            return $this->rosterPresenceCache[$year];
-        }
-
-        $cnt = $this->db->table('student_class')
-            ->where('school_year', $year)
-            ->countAllResults();
-
-        $this->rosterPresenceCache[$year] = $cnt > 0;
-        return $this->rosterPresenceCache[$year];
-    }
-
-    private function hasRosterForSemester(string $schoolYear, string $semester): bool
-    {
-        $year = trim((string)$schoolYear);
-        $sem  = trim((string)$semester);
-        if ($year === '' || $sem === '') {
-            return false;
-        }
-
-        $key = sprintf('sem:%s:%s', $year, $sem);
-        if (array_key_exists($key, $this->rosterPresenceCache)) {
-            return $this->rosterPresenceCache[$key];
-        }
-
-        $cnt = $this->db->table('student_class')
-            ->where('school_year', $year)
-            ->where('semester', $sem)
-            ->countAllResults();
-
-        $this->rosterPresenceCache[$key] = $cnt > 0;
-        return $this->rosterPresenceCache[$key];
-    }
-
-    private function buildInventoryAvailability(string $schoolYear, string $semester, bool $limitToSemester, array $allowed): array
-    {
-        $inventoryMap = array_fill_keys($allowed, 0);
-
-        $joinRows = $this->db->table('inventory_items ii')
-            ->select('ic.name AS item_name, COALESCE(SUM(CASE WHEN ii.good_qty IS NOT NULL THEN ii.good_qty WHEN ii.`condition`="good" THEN ii.quantity ELSE 0 END),0) AS available')
-            ->join('inventory_categories ic', 'ic.id = ii.category_id', 'left')
-            ->where('ii.type', 'classroom')
-            ->where('ii.school_year', $schoolYear)
-            ->whereIn('ic.name', $allowed);
-        if ($limitToSemester && $semester !== '') {
-            $joinRows->where('ii.semester', $semester);
-        }
-        $joinRows = $joinRows->groupBy('ic.name')->get()->getResultArray();
-
-        foreach ($joinRows as $r) {
-            $name = (string)($r['item_name'] ?? '');
-            if ($name !== '' && isset($inventoryMap[$name])) {
-                $inventoryMap[$name] = max($inventoryMap[$name], (int)($r['available'] ?? 0));
-            }
-        }
-
-        $nameRows = $this->db->table('inventory_items')
-            ->select('name AS item_name, COALESCE(SUM(CASE WHEN good_qty IS NOT NULL THEN good_qty WHEN `condition`="good" THEN quantity ELSE 0 END),0) AS available')
-            ->where('type', 'classroom')
-            ->where('school_year', $schoolYear)
-            ->whereIn('name', $allowed);
-        if ($limitToSemester && $semester !== '') {
-            $nameRows->where('semester', $semester);
-        }
-        $nameRows = $nameRows->groupBy('name')->get()->getResultArray();
-
-        foreach ($nameRows as $r) {
-            $name = (string)($r['item_name'] ?? '');
-            if ($name !== '' && isset($inventoryMap[$name])) {
-                $inventoryMap[$name] = max($inventoryMap[$name], (int)($r['available'] ?? 0));
-            }
-        }
-
-        return $inventoryMap;
-    }
-}
diff --git a/app/Http/Controllers/old/CommunicationController.php b/app/Http/Controllers/old/CommunicationController.php
deleted file mode 100644
index 991200d9..00000000
--- a/app/Http/Controllers/old/CommunicationController.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php 
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\StudentModel;
-use App\Models\FamilyModel;
-use App\Models\FamilyStudentModel;
-use App\Models\FamilyGuardianModel;
-use App\Models\FamilyCommPrefModel; // optional
-use App\Models\EmailTemplateModel;
-use App\Models\CommunicationLogModel;
-
-class CommunicationController extends BaseController
-{
-    protected StudentModel $studentModel;
-    protected FamilyModel $familyModel;
-    protected FamilyStudentModel $fsModel;
-    protected FamilyGuardianModel $fgModel;
-    protected ?FamilyCommPrefModel $fcpModel = null;
-    protected EmailTemplateModel $templateModel;
-    protected CommunicationLogModel $logModel;
-
-    public function __construct()
-    {
-        $this->studentModel  = new StudentModel();
-        $this->familyModel   = new FamilyModel();
-        $this->fsModel       = new FamilyStudentModel();
-        $this->fgModel       = new FamilyGuardianModel();
-        if (class_exists(FamilyCommPrefModel::class)) {
-            $this->fcpModel = new FamilyCommPrefModel();
-        }
-        $this->templateModel = new EmailTemplateModel();
-        $this->logModel      = new CommunicationLogModel();
-    }
-
-    public function index()
-    {
-        $students  = $this->studentModel->orderBy('lastname, firstname', 'asc')->findAll();
-        $templates = $this->templateModel->getActiveTemplates();
-        return view('communications/index', compact('students','templates'));
-    }
-
-    // AJAX: families for a student
-    public function families(int $studentId)
-    {
-        if (!$this->request->isAJAX()) return $this->response->setStatusCode(400)->setJSON(['error' => 'Bad request']);
-        $families = $this->fsModel->getFamiliesForStudent($studentId);
-        return $this->response->setJSON(['data' => $families]);
-    }
-
-    // AJAX: guardians for a family
-    public function guardians(int $familyId)
-    {
-        if (!$this->request->isAJAX()) return $this->response->setStatusCode(400)->setJSON(['error' => 'Bad request']);
-        $db = \Config\Database::connect();
-        $rows = $db->query("SELECT u.id as user_id, u.firstname, u.lastname, u.email, fg.relation, fg.is_primary, fg.receive_emails, fg.receive_sms\n                             FROM family_guardians fg\n                             JOIN users u ON u.id = fg.user_id\n                             WHERE fg.family_id = ?", [$familyId])->getResultArray();
-        return $this->response->setJSON(['data' => $rows]);
-    }
-
-    public function preview()
-    {
-        if (!$this->request->isAJAX()) return $this->response->setStatusCode(400)->setJSON(['error' => 'Bad request']);
-
-        $templateKey = (string) $this->request->getPost('template_key');
-        $studentId   = (int) $this->request->getPost('student_id');
-        $familyId    = (int) $this->request->getPost('family_id');
-        $varsPost    = $this->request->getPost('vars');
-        $vars        = is_array($varsPost) ? $varsPost : json_decode((string)$varsPost, true) ?? [];
-
-        $template = $this->templateModel->findByKey($templateKey);
-        if (!$template) return $this->response->setStatusCode(404)->setJSON(['error' => 'Template not found']);
-
-        $student = $this->studentModel->getStudentBasic($studentId);
-        if (!$student) return $this->response->setStatusCode(404)->setJSON(['error' => 'Student not found']);
-
-        // Build salutation from guardians in the chosen family
-        $db = \Config\Database::connect();
-        $gs = $db->query("SELECT u.firstname, u.lastname\n                           FROM family_guardians fg\n                           JOIN users u ON u.id = fg.user_id\n                           WHERE fg.family_id = ? AND fg.receive_emails = 1\n                           ORDER BY fg.is_primary DESC, u.lastname, u.firstname", [$familyId])->getResultArray();
-        $sal = 'Parent/Guardian';
-        if ($gs) {
-            $names = array_map(fn($r)=> trim(($r['firstname']??'').' '.($r['lastname']??'')), $gs);
-            $sal = implode(' & ', $names);
-        }
-
-        $autoVars = [
-            'student_fullname' => trim(($student['firstname'] ?? '').' '.($student['lastname'] ?? '')),
-            'student_grade'    => $student['grade'] ?? '',
-            'parent_salutation'=> $sal,
-            'date'             => local_date(utc_now(), 'Y-m-d'),
-            'school_name'      => 'Al Rahma Sunday School',
-            'teacher_name'     => (string)(session('display_name') ?? 'Teacher'),
-        ];
-        $all = array_merge($autoVars, $vars);
-
-        $subject = $this->renderTwig($template['subject'], $all);
-        $body    = nl2br($this->renderTwig($template['body'], $all));
-
-        return $this->response->setJSON(['subject' => $subject, 'html' => $body]);
-    }
-
-    public function send()
-    {
-        $rules = [
-            'student_id'   => 'required|integer',
-            'family_id'    => 'required|integer',
-            'template_key' => 'required|string',
-            'subject'      => 'required|string',
-            'body'         => 'required|string',
-            'recipients'   => 'required|string' // JSON array
-        ];
-        if (!$this->validate($rules)) {
-            return redirect()->back()->with('error', 'Invalid form submission.');
-        }
-
-        $studentId   = (int) $this->request->getPost('student_id');
-        $familyId    = (int) $this->request->getPost('family_id');
-        $templateKey = (string) $this->request->getPost('template_key');
-        $subject     = (string) $this->request->getPost('subject');
-        $bodyHtml    = (string) $this->request->getPost('body');
-        $recipients  = json_decode((string)$this->request->getPost('recipients'), true) ?? [];
-        $cc          = json_decode((string)($this->request->getPost('cc') ?? '[]'), true) ?? [];
-        $bcc         = json_decode((string)($this->request->getPost('bcc') ?? '[]'), true) ?? [];
-
-        $student = $this->studentModel->getStudentBasic($studentId);
-        if (!$student) return redirect()->back()->with('error', 'Student not found');
-
-        // Send email (PHPMailer via service('mailer'))
-        $sendOk = false; $error = null;
-        try {
-            $mailer = service('mailer');
-            foreach (array_unique($recipients) as $to) { if ($to) $mailer->addAddress($to); }
-            foreach (array_unique($cc) as $c) { if ($c) $mailer->addCC($c); }
-            foreach (array_unique($bcc) as $b){ if ($b) $mailer->addBCC($b); }
-            $mailer->Subject = $subject;
-            $mailer->isHTML(true);
-            $mailer->Body = $bodyHtml;
-            $mailer->AltBody = strip_tags($bodyHtml);
-            $sendOk = $mailer->send();
-        } catch (\Throwable $t) {
-            $error = $t->getMessage();
-        }
-
-        // Log
-        $this->logModel->insert([
-            'student_id'   => $studentId,
-            'family_id'    => $familyId,
-            'student_name' => trim(($student['firstname'] ?? '').' '.($student['lastname'] ?? '')),
-            'template_key' => $templateKey,
-            'subject'      => $subject,
-            'body'         => $bodyHtml,
-            'recipients'   => json_encode(array_values($recipients)),
-            'cc'           => json_encode(array_values($cc)),
-            'bcc'          => json_encode(array_values($bcc)),
-            'status'       => $sendOk ? 'sent' : 'failed',
-            'error_message'=> $error,
-            'sent_by'      => (int)(session('user_id') ?? 0),
-            'metadata'     => null,
-        ]);
-
-        return $sendOk
-            ? redirect()->to('/communications')->with('success', 'Email sent successfully.')
-            : redirect()->back()->with('error', 'Failed to send email: '.($error ?? 'Unknown error'));
-    }
-
-    private function renderTwig(string $template, array $vars): string
-    {
-        return preg_replace_callback('/\{\{\s*([a-zA-Z0-9_\.]+)\s*\}\}/', function($m) use ($vars) {
-            $key = $m[1];
-            return htmlspecialchars((string)($vars[$key] ?? ''), ENT_QUOTES, 'UTF-8');
-        }, $template);
-    }
-}
diff --git a/app/Http/Controllers/old/CompetitionScoresController.php b/app/Http/Controllers/old/CompetitionScoresController.php
deleted file mode 100644
index 29fd114e..00000000
--- a/app/Http/Controllers/old/CompetitionScoresController.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\ClassSectionModel;
-use App\Models\CompetitionClassWinnerModel;
-use App\Models\CompetitionModel;
-use App\Models\CompetitionScoreModel;
-use App\Models\ConfigurationModel;
-use App\Models\TeacherClassModel;
-
-class CompetitionScoresController extends BaseController
-{
-    protected $db;
-    protected TeacherClassModel $teacherClassModel;
-    protected ConfigurationModel $configModel;
-    protected ClassSectionModel $classSectionModel;
-    protected CompetitionClassWinnerModel $classWinnerModel;
-    protected string $classStudentTable;
-    protected bool $hasQuestionCount = false;
-    protected bool $hasClassWinnerTable = false;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->configModel = new ConfigurationModel();
-        $this->classSectionModel = new ClassSectionModel();
-        $this->classWinnerModel = new CompetitionClassWinnerModel();
-
-        if ($this->db->tableExists('class_student')) {
-            $this->classStudentTable = 'class_student';
-        } elseif ($this->db->tableExists('student_class')) {
-            $this->classStudentTable = 'student_class';
-        } else {
-            $this->classStudentTable = '';
-        }
-
-        $this->hasClassWinnerTable = $this->db->tableExists('competition_class_winners');
-        $this->hasQuestionCount = $this->hasClassWinnerTable
-            && $this->db->fieldExists('question_count', 'competition_class_winners');
-    }
-
-    public function index()
-    {
-        [$assignments, $schoolYear, $semester] = $this->getTeacherContext();
-        $activeClassId = $this->resolveActiveClassId($assignments);
-        $activeClassName = $this->getActiveClassName($assignments, $activeClassId);
-
-        if (empty($assignments) || $activeClassId <= 0) {
-            return view('teacher/competition_scores/index', [
-                'competitions'    => [],
-                'activeClassId'   => $activeClassId,
-                'activeClassName' => $activeClassName,
-                'questionCounts'  => [],
-                'scoreCounts'     => [],
-                'studentTotal'    => 0,
-                'sectionMap'      => $this->getClassSectionMap(),
-                'schoolYear'      => $schoolYear,
-                'semester'        => $semester,
-                'hasClasses'      => false,
-            ]);
-        }
-
-        $competitions = $this->getCompetitionsForClass($activeClassId, $schoolYear, $semester);
-        $competitionIds = array_values(array_filter(array_map(static function ($row) {
-            return (int) ($row['id'] ?? 0);
-        }, $competitions)));
-
-        $questionCounts = $this->getQuestionCounts($competitionIds, $activeClassId);
-        $scoreCounts = $this->getScoreCounts($competitionIds, $activeClassId);
-        $studentTotal = $this->getClassStudentCount($activeClassId, $schoolYear);
-
-        return view('teacher/competition_scores/index', [
-            'competitions'    => $competitions,
-            'activeClassId'   => $activeClassId,
-            'activeClassName' => $activeClassName,
-            'questionCounts'  => $questionCounts,
-            'scoreCounts'     => $scoreCounts,
-            'studentTotal'    => $studentTotal,
-            'sectionMap'      => $this->getClassSectionMap(),
-            'schoolYear'      => $schoolYear,
-            'semester'        => $semester,
-            'hasClasses'      => true,
-        ]);
-    }
-
-    public function edit($id)
-    {
-        [$assignments, $schoolYear, $semester] = $this->getTeacherContext();
-        $allowedClassIds = $this->getAllowedClassIds($assignments);
-        if (empty($allowedClassIds)) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'No class assignments found for your account.');
-        }
-
-        $competitionModel = new CompetitionModel();
-        $scoreModel = new CompetitionScoreModel();
-        $competition = $competitionModel->find($id);
-        if (!$competition) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'Competition not found.');
-        }
-        $isLocked = !empty($competition['is_locked']);
-
-        $activeClassId = $this->resolveActiveClassId($assignments);
-        $lockedClassId = (int) ($competition['class_section_id'] ?? 0);
-        $classSectionId = $lockedClassId > 0 ? $lockedClassId : $activeClassId;
-        if ($classSectionId <= 0) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'Select a class section before entering scores.');
-        }
-        if (!in_array($classSectionId, $allowedClassIds, true)) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'You are not assigned to that class.');
-        }
-
-        $students = $this->getStudentsForCompetition($competition, $classSectionId);
-        $existingScores = $scoreModel
-            ->where('competition_id', $id)
-            ->where('class_section_id', $classSectionId)
-            ->findAll();
-
-        $scoreMap = [];
-        foreach ($existingScores as $row) {
-            $scoreMap[$row['student_id']] = $row['score'];
-        }
-
-        $questionCount = null;
-        if ($this->hasQuestionCount && $this->hasClassWinnerTable) {
-            $row = $this->classWinnerModel
-                ->select('question_count')
-                ->where('competition_id', $id)
-                ->where('class_section_id', $classSectionId)
-                ->first();
-            if ($row && $row['question_count'] !== null) {
-                $questionCount = (int) $row['question_count'];
-            }
-        }
-
-        $classStudentCount = $this->getClassStudentCount(
-            $classSectionId,
-            $competition['school_year'] ?? $schoolYear
-        );
-
-        $activeClassName = $this->getActiveClassName($assignments, $classSectionId);
-
-        return view('teacher/competition_scores/scores', [
-            'competition'       => $competition,
-            'students'          => $students,
-            'scoreMap'          => $scoreMap,
-            'classSectionId'    => $classSectionId,
-            'classSectionName'  => $activeClassName,
-            'classStudentCount' => $classStudentCount,
-            'questionCount'     => $questionCount,
-            'classSelectionLocked' => $lockedClassId > 0,
-            'isLocked'          => $isLocked,
-        ]);
-    }
-
-    public function save($id)
-    {
-        [$assignments] = $this->getTeacherContext();
-        $allowedClassIds = $this->getAllowedClassIds($assignments);
-        if (empty($allowedClassIds)) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'No class assignments found for your account.');
-        }
-
-        $competitionModel = new CompetitionModel();
-        $scoreModel = new CompetitionScoreModel();
-        $competition = $competitionModel->find($id);
-        if (!$competition) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'Competition not found.');
-        }
-        if (!empty($competition['is_locked'])) {
-            return redirect()->to("/teacher/competition-scores/{$id}")
-                ->with('error', 'Competition is locked. You cannot update scores.');
-        }
-
-        $lockedClassId = (int) ($competition['class_section_id'] ?? 0);
-        $classSectionId = $lockedClassId > 0
-            ? $lockedClassId
-            : (int) $this->request->getPost('class_section_id');
-        if ($classSectionId <= 0) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'Select a class section before saving scores.');
-        }
-        if (!in_array($classSectionId, $allowedClassIds, true)) {
-            return redirect()->to('/teacher/competition-scores')
-                ->with('error', 'You are not assigned to that class.');
-        }
-
-        $scores = (array) $this->request->getPost('scores');
-        $cleanScores = [];
-        $invalidScores = [];
-
-        foreach ($scores as $studentId => $scoreValue) {
-            $scoreValue = trim((string) $scoreValue);
-            if ($scoreValue === '') {
-                continue;
-            }
-            if (!preg_match('/^\d+$/', $scoreValue)) {
-                $invalidScores[] = $studentId;
-                continue;
-            }
-            $cleanScores[(int) $studentId] = (int) $scoreValue;
-        }
-
-        if (!empty($invalidScores)) {
-            return redirect()->to("/teacher/competition-scores/{$id}")
-                ->with('error', 'Scores must be whole numbers (no decimals).');
-        }
-
-        foreach ($cleanScores as $studentId => $scoreValue) {
-            $existing = $scoreModel
-                ->where('competition_id', $id)
-                ->where('student_id', (int) $studentId)
-                ->where('class_section_id', $classSectionId)
-                ->first();
-
-            if ($existing) {
-                $scoreModel->update($existing['id'], [
-                    'score'            => $scoreValue,
-                    'class_section_id' => $classSectionId,
-                ]);
-            } else {
-                $scoreModel->insert([
-                    'competition_id'   => (int) $id,
-                    'student_id'       => (int) $studentId,
-                    'class_section_id' => $classSectionId,
-                    'score'            => $scoreValue,
-                ]);
-            }
-        }
-
-        return redirect()->to("/teacher/competition-scores/{$id}")
-            ->with('success', 'Scores saved.');
-    }
-
-    private function getTeacherContext(): array
-    {
-        $userId = (int) (session()->get('user_id') ?? 0);
-        $schoolYear = (string) ($this->configModel->getConfig('school_year') ?? '');
-        $semester = (string) ($this->configModel->getConfig('semester') ?? '');
-        $assignments = $this->teacherClassModel->getClassAssignmentsByUserId(
-            $userId,
-            $schoolYear,
-            $semester
-        );
-
-        return [$assignments, $schoolYear, $semester];
-    }
-
-    private function getAllowedClassIds(array $assignments): array
-    {
-        $ids = array_map(static function ($row) {
-            return (int) ($row['class_section_id'] ?? 0);
-        }, $assignments);
-
-        $ids = array_values(array_filter(array_unique($ids)));
-        return $ids;
-    }
-
-    private function resolveActiveClassId(array $assignments): int
-    {
-        $allowed = $this->getAllowedClassIds($assignments);
-        $active = (int) (session()->get('class_section_id') ?? 0);
-        if ($active > 0 && in_array($active, $allowed, true)) {
-            return $active;
-        }
-
-        $active = $allowed[0] ?? 0;
-        if ($active > 0) {
-            session()->set('class_section_id', $active);
-        }
-
-        return (int) $active;
-    }
-
-    private function getActiveClassName(array $assignments, int $classSectionId): ?string
-    {
-        if ($classSectionId <= 0) {
-            return null;
-        }
-
-        foreach ($assignments as $row) {
-            if ((int) ($row['class_section_id'] ?? 0) === $classSectionId) {
-                return $row['class_section_name'] ?? null;
-            }
-        }
-
-        $row = $this->classSectionModel
-            ->select('class_section_name')
-            ->where('class_section_id', $classSectionId)
-            ->first();
-
-        return $row['class_section_name'] ?? null;
-    }
-
-    private function getCompetitionsForClass(int $classSectionId, string $schoolYear, string $semester): array
-    {
-        $competitionModel = new CompetitionModel();
-        $builder = $competitionModel->orderBy('id', 'DESC');
-
-        if ($classSectionId > 0) {
-            $builder->groupStart()
-                ->where('class_section_id', $classSectionId)
-                ->orWhere('class_section_id', 0)
-                ->orWhere('class_section_id IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($schoolYear !== '') {
-            $builder->groupStart()
-                ->where('school_year', $schoolYear)
-                ->orWhere('school_year', '')
-                ->orWhere('school_year IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($semester !== '') {
-            $builder->groupStart()
-                ->where('semester', $semester)
-                ->orWhere('semester', '')
-                ->orWhere('semester IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        return $builder->findAll();
-    }
-
-    private function getQuestionCounts(array $competitionIds, int $classSectionId): array
-    {
-        if (!$this->hasQuestionCount || !$this->hasClassWinnerTable || empty($competitionIds)) {
-            return [];
-        }
-
-        $rows = $this->classWinnerModel
-            ->select('competition_id, question_count')
-            ->where('class_section_id', $classSectionId)
-            ->whereIn('competition_id', $competitionIds)
-            ->findAll();
-
-        $out = [];
-        foreach ($rows as $row) {
-            $compId = (int) ($row['competition_id'] ?? 0);
-            if ($compId > 0 && $row['question_count'] !== null) {
-                $out[$compId] = (int) $row['question_count'];
-            }
-        }
-
-        return $out;
-    }
-
-    private function getScoreCounts(array $competitionIds, int $classSectionId): array
-    {
-        if (empty($competitionIds)) {
-            return [];
-        }
-
-        $rows = $this->db->table('competition_scores')
-            ->select('competition_id, COUNT(*) AS total')
-            ->where('class_section_id', $classSectionId)
-            ->whereIn('competition_id', $competitionIds)
-            ->groupBy('competition_id')
-            ->get()
-            ->getResultArray();
-
-        $out = [];
-        foreach ($rows as $row) {
-            $compId = (int) ($row['competition_id'] ?? 0);
-            if ($compId > 0) {
-                $out[$compId] = (int) ($row['total'] ?? 0);
-            }
-        }
-
-        return $out;
-    }
-
-    private function getClassStudentCount(int $classSectionId, ?string $schoolYear): int
-    {
-        if ($classSectionId <= 0 || $this->classStudentTable === '') {
-            return 0;
-        }
-
-        $builder = $this->db->table($this->classStudentTable)
-            ->select('COUNT(*) AS total')
-            ->where('class_section_id', $classSectionId);
-
-        if ($schoolYear && $this->db->fieldExists('school_year', $this->classStudentTable)) {
-            $builder->where('school_year', $schoolYear);
-        }
-
-        $row = $builder->get()->getRowArray();
-        return (int) ($row['total'] ?? 0);
-    }
-
-    private function getStudentsForCompetition(array $competition, int $classSectionId): array
-    {
-        if ($classSectionId <= 0 || $this->classStudentTable === '') {
-            return [];
-        }
-
-        $builder = $this->db->table('students s')
-            ->select('s.id, s.school_id, s.firstname, s.lastname')
-            ->join($this->classStudentTable . ' cs', 'cs.student_id = s.id', 'inner')
-            ->where('cs.class_section_id', $classSectionId);
-
-        $hasSchoolYear = $this->db->fieldExists('school_year', $this->classStudentTable);
-        if ($hasSchoolYear && !empty($competition['school_year'])) {
-            $builder->where('cs.school_year', $competition['school_year']);
-        }
-
-        $builder->distinct();
-        $builder->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC');
-
-        return $builder->get()->getResultArray();
-    }
-
-    private function getClassSectionMap(): array
-    {
-        $sections = $this->classSectionModel
-            ->select('class_section_id, class_section_name')
-            ->orderBy('class_section_name', 'ASC')
-            ->findAll();
-
-        $map = [];
-        foreach ($sections as $section) {
-            $id = (int) ($section['class_section_id'] ?? 0);
-            if ($id > 0) {
-                $map[$id] = $section['class_section_name'] ?? (string) $id;
-            }
-        }
-
-        return $map;
-    }
-}
diff --git a/app/Http/Controllers/old/DiscountController.php b/app/Http/Controllers/old/DiscountController.php
deleted file mode 100644
index 85fbf27a..00000000
--- a/app/Http/Controllers/old/DiscountController.php
+++ /dev/null
@@ -1,906 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use App\Models\DiscountVoucherModel;
-use App\Models\DiscountUsageModel;
-use App\Models\InvoiceModel;
-use App\Models\UserModel;
-use App\Models\ConfigurationModel;
-use App\Models\PaymentModel;
-use App\Models\EnrollmentModel;
-use App\Models\EventChargesModel;
-use App\Models\AdditionalChargeModel;
-use App\Models\ClassSectionModel;
-use CodeIgniter\Events\Events;
-
-class DiscountController extends BaseController
-{
-    protected $configModel;
-    protected $voucherModel;
-    protected $invoiceModel;
-    protected $userModel;
-    protected $db;
-    protected $schoolYear;
-    protected $semester;
-    protected $paymentModel;
-    protected $enrollmentModel;
-    protected $eventChargesModel;
-    protected $additionalChargeModel;
-    protected $classSectionModel;
-
-    public function __construct()
-    {
-        $this->configModel = new ConfigurationModel();
-        $this->voucherModel = new DiscountVoucherModel();
-        $this->invoiceModel = new InvoiceModel();
-        $this->userModel = new UserModel();
-        $this->db = \Config\Database::connect();
-        $this->paymentModel = new PaymentModel();
-        $this->enrollmentModel = new EnrollmentModel();
-        $this->eventChargesModel = new EventChargesModel();
-        $this->additionalChargeModel = new AdditionalChargeModel();
-        $this->classSectionModel = new ClassSectionModel();
-
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-    }
-
-    public function applyVoucher()
-    {
-        if (strtolower($this->request->getMethod()) === 'post') {
-            $voucherId = $this->request->getPost('voucher_id');
-            $parentIds = $this->request->getPost('parent_ids') ?? [];
-            $allowAdditional = (bool) $this->request->getPost('allow_additional');
-
-            if (empty($parentIds)) {
-                return redirect()->back()->with('error', 'Please select at least one parent.');
-            }
-
-            $voucher = $this->voucherModel->find($voucherId);
-            if (!$voucher) {
-                return redirect()->back()->with('error', 'Voucher not found.');
-            }
-
-            // Normalize description from voucher (optional)
-            $voucherDescription = trim((string) ($voucher['description'] ?? ''));
-            $voucherDescription = preg_replace(
-                '/^Auto-generated on \d{4}-\d{2}-\d{2}\s*[—-]\s*reason:\s*/i',
-                '',
-                $voucherDescription
-            );
-
-            $maxUsesRaw = $voucher['max_uses'] ?? null;
-            $maxUses = ($maxUsesRaw === null || $maxUsesRaw === '') ? null : (int) $maxUsesRaw;
-            $timesUsed = (int) ($voucher['times_used'] ?? 0);
-            $remainingUses = ($maxUses === null) ? PHP_INT_MAX : ($maxUses - $timesUsed);
-            if ($remainingUses <= 0) {
-                return redirect()->back()->with('error', 'This voucher has reached its maximum allowed uses.');
-            }
-
-            // If not allowing additional discounts, filter out parents who already have discounts this school year.
-            if (!$allowAdditional) {
-                $rows = $this->db->table('discount_usages du')
-                    ->select('i.parent_id')
-                    ->join('invoices i', 'i.id = du.invoice_id')
-                    ->whereIn('i.parent_id', $parentIds)
-                    ->where('i.school_year', $this->schoolYear)
-                    ->groupBy('i.parent_id')
-                    ->get()
-                    ->getResultArray();
-                $blockedParentIds = array_map(static fn($r) => (int) $r['parent_id'], $rows);
-                if (!empty($blockedParentIds)) {
-                    $parentIds = array_values(array_diff(
-                        array_map('intval', $parentIds),
-                        $blockedParentIds
-                    ));
-                }
-                if (empty($parentIds)) {
-                    return redirect()->back()->with('error', 'All selected parents already have discounts. Enable "Allow additional discounts" to apply another.');
-                }
-            }
-
-            $paymentDate = utc_now();
-
-            // Collect invoice IDs that end up fully covered by the voucher in this run
-            $fullyCoveredInvoiceIds = [];
-            $touchedInvoiceIds = [];
-            $appliedCount = 0;
-
-            $this->db->transStart();
-
-            foreach ($parentIds as $parentId) {
-                // Fetch invoices for this parent & school year
-                $invoices = $this->invoiceModel->getInvoicesByUserId($parentId, $this->schoolYear);
-                if (empty($invoices)) {
-                    // Do NOT early-return inside a transaction; just continue
-                    session()->setFlashdata('error', 'A selected parent has no invoice in record.');
-                    continue;
-                }
-
-                foreach ($invoices as $invoice) {
-                    if ($remainingUses <= 0) break 2; // out of parentIds loop too
-
-                    // Snapshot current balance BEFORE applying
-                    $initialPreBalance = (float) $this->getCurrentInvoiceBalance($invoice['id'], $this->schoolYear);
-                    if ($initialPreBalance <= 0) {
-                        log_message(
-                            'error',
-                            'applyVoucher skip: zero balance | voucher_id={vid} parent_id={pid} invoice_id={iid} invoice_number={inum} balance={bal}',
-                            [
-                                'vid'  => (int)$voucherId,
-                                'pid'  => (int)$parentId,
-                                'iid'  => (int)$invoice['id'],
-                                'inum' => (string)($invoice['invoice_number'] ?? ''),
-                                'bal'  => $initialPreBalance,
-                            ]
-                        );
-                        continue;
-                    }
-
-                    // Already used this voucher on this invoice?
-                    if (!$allowAdditional) {
-                        $exists = $this->db->table('discount_usages du')
-                            ->join('invoices i', 'du.invoice_id = i.id')
-                            ->where('du.voucher_id', $voucherId)
-                            ->where('du.invoice_id', $invoice['id'])
-                            ->where('i.school_year', $this->schoolYear)
-                            ->countAllResults();
-                        if ($exists) {
-                            log_message(
-                                'error',
-                                'applyVoucher skip: voucher already used | voucher_id={vid} parent_id={pid} invoice_id={iid} invoice_number={inum}',
-                                [
-                                    'vid'  => (int)$voucherId,
-                                    'pid'  => (int)$parentId,
-                                    'iid'  => (int)$invoice['id'],
-                                    'inum' => (string)($invoice['invoice_number'] ?? ''),
-                                ]
-                            );
-                            continue;
-                        }
-                    }
-
-                    // Calculate discount
-                    $rawDiscount = ($voucher['discount_type'] === 'percent')
-                        ? round(((float)$invoice['total_amount'] * (float)$voucher['discount_value']) / 100, 2)
-                        : (float) $voucher['discount_value'];
-
-                    // Cap by CURRENT invoice balance snapshot
-                    $discount = min($rawDiscount, $initialPreBalance);
-
-                    // Nothing to do if no discount
-                    if ($discount <= 0) {
-                        log_message(
-                            'error',
-                            'applyVoucher skip: discount <= 0 | voucher_id={vid} parent_id={pid} invoice_id={iid} invoice_number={inum} raw_discount={raw} balance={bal}',
-                            [
-                                'vid'  => (int)$voucherId,
-                                'pid'  => (int)$parentId,
-                                'iid'  => (int)$invoice['id'],
-                                'inum' => (string)($invoice['invoice_number'] ?? ''),
-                                'raw'  => $rawDiscount,
-                                'bal'  => $initialPreBalance,
-                            ]
-                        );
-                        continue;
-                    }
-
-                    // Insert discount usage
-                    $now = utc_now();
-                    $this->db->table('discount_usages')->insert([
-                        'voucher_id'      => $voucherId,
-                        'invoice_id'      => $invoice['id'],
-                        'parent_id'       => $parentId,
-                        'discount_amount' => $discount,
-                        'description'     => $voucherDescription,
-                        'school_year'     => $this->schoolYear,
-                        'updated_by'      => session()->get('user_id'),
-                        'used_at'         => $now,
-                        'created_at'      => $now,
-                        'updated_at'      => $now,
-                    ]);
-
-                    // Update invoice balance based on pre-discount snapshot (supports multiple discounts)
-                    $newBalance = max(0.0, round($initialPreBalance - $discount, 2));
-                    $this->db->table('invoices')
-                        ->where('id', $invoice['id'])
-                        ->update([
-                            'balance'      => $newBalance,
-                            'has_discount' => 1,
-                            'updated_at'   => $now,
-                        ]);
-
-                    // Compute post-balance based on pre-snapshot (more stable than $invoice['balance'])
-                    $postBalance = round($initialPreBalance - $discount, 2);
-                    if ($postBalance < 0) $postBalance = 0.0;
-
-                    // (Optional) current balance re-check (in case of concurrent writes)
-                    $currentBalance = (float) $this->getCurrentInvoiceBalance($invoice['id'], $this->schoolYear);
-
-                    // Increment voucher usage
-                    $this->db->table('discount_vouchers')
-                        ->where('id', $voucherId)
-                        ->set('times_used', 'COALESCE(times_used,0) + 1', false)
-                        ->update();
-
-                    // Prepare and trigger payment event
-                    [$eventData, $studentData] = $this->buildPaymentEventData(
-                        $invoice['id'],
-                        $voucherId,
-                        $discount,
-                        'discount',
-                        $paymentDate,
-                        '',
-                        0,
-                        $initialPreBalance,   // pre-payment snapshot
-                        $postBalance          // computed post-payment
-                    );
-                    Events::trigger('paymentReceived', $eventData, $studentData);
-
-                    $touchedInvoiceIds[] = (int) $invoice['id'];
-                    $appliedCount++;
-
-                    // If voucher covered the entire current balance, mark to update enrollments
-                    // Use a small epsilon to tolerate cents rounding.
-                    $epsilon = 0.01;
-                    $fullyCovered = (abs($discount - $initialPreBalance) <= $epsilon)
-                        || ($postBalance <= $epsilon)
-                        || ($currentBalance <= $epsilon);
-
-                    if ($fullyCovered) {
-                        $fullyCoveredInvoiceIds[] = (int) $invoice['id'];
-                    }
-
-                    $remainingUses--;
-
-                    // Deactivate if we just hit the cap
-                    if ($remainingUses <= 0 && $maxUses !== null) {
-                        $this->db->table('discount_vouchers')
-                            ->where('id', $voucherId)
-                            ->update([
-                                'is_active'  => 0,
-                                'updated_at' => $now,
-                            ]);
-                        break 2;
-                    }
-                }
-            }
-
-            $this->db->transComplete();
-
-            if ($this->db->transStatus() === false) {
-                return redirect()->back()->with('error', 'Voucher application failed. Transaction rolled back.');
-            }
-
-            if ($appliedCount === 0) {
-                return redirect()->back()->with('error', 'No discounts were applied. The voucher may already be used for these invoices or balances are zero.');
-            }
-
-            // ✅ Ensure voucher deactivates when max_uses reached (handles edge cases)
-            if ($maxUses !== null) {
-                $row = $this->db->table('discount_vouchers')
-                    ->select('times_used')
-                    ->where('id', $voucherId)
-                    ->get()
-                    ->getRowArray();
-                $usedNow = (int) ($row['times_used'] ?? 0);
-                if ($usedNow >= $maxUses) {
-                    $this->db->table('discount_vouchers')
-                        ->where('id', $voucherId)
-                        ->update([
-                            'is_active'  => 0,
-                            'updated_at' => utc_now(),
-                        ]);
-                }
-            }
-
-            // ✅ AFTER COMMIT: recalculate invoice totals/balance/paid/discount/refund
-            foreach (array_unique($touchedInvoiceIds) as $iid) {
-                try {
-                    $this->recalculateInvoice($iid, $this->schoolYear);
-                } catch (\Throwable $e) {
-                    log_message('error', 'recalculateInvoice failed for invoice {iid}: {err}', [
-                        'iid' => $iid,
-                        'err' => $e->getMessage(),
-                    ]);
-                }
-            }
-
-            // ✅ AFTER COMMIT: update enrollments for fully-covered invoices
-            // Avoid nested transactions by doing this post-commit.
-            $updatedTotal = 0;
-            foreach (array_unique($fullyCoveredInvoiceIds) as $iid) {
-                try {
-                    $updatedTotal += (int) $this->updateEnrollmentStatusIfPaid($iid);
-                } catch (\Throwable $e) {
-                    log_message('error', 'updateEnrollmentStatusIfPaid failed for invoice {iid}: {err}', [
-                        'iid' => $iid,
-                        'err' => $e->getMessage(),
-                    ]);
-                }
-            }
-
-            if ($updatedTotal > 0) {
-                return redirect()->back()->with('success', 'Voucher applied successfully and enrollments updated.');
-            }
-            return redirect()->back()->with('success', 'Voucher applied successfully.');
-        }
-
-        // GET: load page
-        $parents = $this->userModel->getParents();
-
-        foreach ($parents as &$parent) {
-            $discount = $this->db->table('discount_usages')
-                ->select('COALESCE(SUM(discount_amount),0) AS total_discount')
-                ->where('parent_id', $parent['id'])
-                ->where('school_year', $this->schoolYear)
-                ->get()
-                ->getRowArray();
-
-            $parent['total_discount'] = $discount['total_discount'] ?? 0;
-            $parent['has_discount']   = ($parent['total_discount'] > 0) ? 1 : 0;
-        }
-        unset($parent);
-
-        return view('discounts/apply_voucher', [
-            'vouchers' => $this->voucherModel->where('is_active', 1)->findAll(),
-            'parents'  => $parents,
-        ]);
-    }
-
-    private function updateEnrollmentStatusIfPaid(int $invoiceId): int
-    {
-        // 1) Fetch invoice
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) {
-            log_message('warning', 'Invoice not found: {id}', ['id' => $invoiceId]);
-            return 0;
-        }
-
-        // 2) Payment check (any payment recorded: balance < total)
-        $total   = (float) ($invoice['total_amount'] ?? 0);
-        $balance = (float) ($invoice['balance'] ?? 0);
-        if (!($total > 0 && $balance < $total)) {
-            log_message('info', 'No payment yet. Skipping enrollment update. Invoice #{id}', ['id' => $invoiceId]);
-            return 0;
-        }
-
-        $parentId   = (int) ($invoice['parent_id'] ?? 0);
-        $schoolYear = (string) $this->schoolYear;
-        if ($parentId <= 0 || $schoolYear === '') {
-            log_message('warning', 'updateEnrollmentStatusIfPaid: missing parent_id/school_year for invoice #{id}', ['id' => $invoiceId]);
-            return 0;
-        }
-
-        // 3) Try to limit to enrollments actually present on the invoice (optional)
-        //    If invoice_items.enrollment_id doesn't exist, this silently falls back to parent/year scope.
-        $paidEnrollmentIds = [];
-        try {
-            $rows = $this->db->table('invoice_items')
-                ->select('enrollment_id')
-                ->where('invoice_id', $invoiceId)
-                ->where('enrollment_id IS NOT NULL', null, false)
-                ->get()->getResultArray();
-            foreach ($rows as $r) {
-                $eid = (int) ($r['enrollment_id'] ?? 0);
-                if ($eid > 0) $paidEnrollmentIds[] = $eid;
-            }
-            $paidEnrollmentIds = array_values(array_unique($paidEnrollmentIds));
-        } catch (\Throwable $e) {
-            // No-op: table/column might not exist in your schema
-        }
-
-        $db = $this->db;
-        $db->transBegin();
-
-        try {
-            // 4) Preview IDs that will be updated (good for debugging “partials”)
-            $previewBuilder = $db->table('enrollments')
-                ->select('id')
-                ->where('parent_id', $parentId)
-                ->where('school_year', $schoolYear)
-                ->groupStart()
-                // tolerant match for 'payment pending' (case/space/nbsp)
-                ->where('enrollment_status', 'payment pending')
-                ->orWhere('enrollment_status', 'Payment pending')
-                ->orWhere('enrollment_status', 'Payment Pending')
-                ->orWhere('enrollment_status', 'PAYMENT PENDING')
-                ->orWhere("LOWER(TRIM(REPLACE(enrollment_status, CHAR(160), ' '))) = 'payment pending'", null, false)
-                ->groupEnd();
-
-            if (!empty($paidEnrollmentIds)) {
-                $previewBuilder->whereIn('id', $paidEnrollmentIds);
-            }
-
-            $toUpdateIds = array_map(
-                static fn($r) => (int)$r['id'],
-                $previewBuilder->get()->getResultArray()
-            );
-
-            if (empty($toUpdateIds)) {
-                $db->transCommit();
-                log_message('info', 'No enrollments matched pending status for parent {p}, year {y}, sem {s}.', [
-                    'p' => $parentId,
-                    'y' => $schoolYear,
-                    's' => 'ALL'
-                ]);
-                return 0;
-            }
-
-            // 5) Perform update with same filters
-            $builder = $db->table('enrollments');
-            $builder->set('enrollment_status', 'enrolled')
-                // Use DB date if you prefer: ->set('enrollment_date', 'CURRENT_DATE()', false)
-                ->set('enrollment_date', local_date(utc_now(), 'Y-m-d'))
-                ->whereIn('id', $toUpdateIds);
-
-            if ($builder->update() === false) {
-                $err = $db->error();
-                throw new \RuntimeException('Enrollments update failed: ' . ($err['message'] ?? 'unknown DB error'));
-            }
-
-            $affected = $db->affectedRows();
-            $db->transCommit();
-
-            log_message(
-                'info',
-                'Enrollment status -> enrolled for {n} row(s). parent={p}, year={y}, sem={s}, ids=[{ids}]',
-                [
-                    'n'   => $affected,
-                    'p'   => $parentId,
-                    'y'   => $schoolYear,
-                    's'   => 'ALL',
-                    'ids' => implode(',', $toUpdateIds),
-                ]
-            );
-
-            return $affected;
-        } catch (\Throwable $e) {
-            $db->transRollback();
-            log_message('error', 'updateEnrollmentStatusIfPaid error: ' . $e->getMessage());
-            return 0;
-        }
-    }
-
-
-    public function listVouchers()
-    {
-
-        $vouchers = $this->voucherModel->findAll();
-        return view('discounts/list', ['vouchers' => $vouchers]);
-    }
-
-    public function createVoucher()
-    {
-        if (strtolower($this->request->getMethod()) === 'post') {
-
-            // -------- Gather & normalize inputs --------
-            $rawCode        = (string) $this->request->getPost('code');
-            // Keep A–Z, 0–9 and dashes; uppercase for consistency
-            $code           = strtoupper(preg_replace('/[^A-Z0-9\-]/i', '', trim($rawCode)));
-
-            $discountType   = strtolower((string) $this->request->getPost('discount_type')); // 'percent' | 'fixed'
-            $discountValue  = (float) ($this->request->getPost('discount_value') ?? 0);
-            $maxUsesRaw     = $this->request->getPost('max_uses');
-            $maxUses        = ($maxUsesRaw === '' || $maxUsesRaw === null) ? null : max(0, (int) $maxUsesRaw);
-
-            $validFrom      = trim((string) ($this->request->getPost('valid_from') ?? ''));
-            $validUntil     = trim((string) ($this->request->getPost('valid_until') ?? ''));
-            $isActive       = $this->request->getPost('is_active') ? 1 : 0;
-
-            // NEW: Description / Reason
-            $description    = trim((string) ($this->request->getPost('description') ?? ''));
-
-            // -------- Basic validations (before model rules) --------
-            $errors = [];
-
-            if ($code === '') {
-                $errors[] = 'Voucher code is required.';
-            }
-
-            if (!in_array($discountType, ['percent', 'fixed'], true)) {
-                $errors[] = 'Discount type must be "percent" or "fixed".';
-            }
-
-            if ($discountType === 'percent') {
-                if ($discountValue <= 0 || $discountValue > 100) {
-                    $errors[] = 'Percentage discount must be between 0 and 100.';
-                }
-            } else { // fixed
-                if ($discountValue < 0) {
-                    $errors[] = 'Fixed discount must be 0 or greater.';
-                }
-            }
-
-            // Dates come from <input type="date"> as YYYY-MM-DD
-            $validFrom = $validFrom !== '' ? $validFrom : null;
-            $validUntil = $validUntil !== '' ? $validUntil : null;
-
-            // Ensure date format is plausible
-            $isDate = static function (?string $d): bool {
-                if ($d === null) return true;
-                return (bool) preg_match('/^\d{4}-\d{2}-\d{2}$/', $d);
-            };
-            if (!$isDate($validFrom))  $errors[] = 'Valid From must be a date (YYYY-MM-DD).';
-            if (!$isDate($validUntil)) $errors[] = 'Valid Until must be a date (YYYY-MM-DD).';
-
-            if ($validFrom && $validUntil && $validFrom > $validUntil) {
-                $errors[] = 'Valid Until must be the same as or after Valid From.';
-            }
-
-            // Optional: require a reason when auto-generated codes are used
-            // if ($description === '' && strlen($code) === 10) {
-            //     $errors[] = 'Please add a description/reason for this voucher.';
-            // }
-
-            if (!empty($errors)) {
-                return redirect()->back()->withInput()->with('error', implode(' ', $errors));
-            }
-
-            // -------- Prepare payload for model --------
-            $data = [
-                'code'           => $code,
-                'discount_type'  => $discountType,
-                'discount_value' => $discountValue,
-                'max_uses'       => $maxUses,
-                'valid_from'     => $validFrom,
-                'valid_until'    => $validUntil,
-                'is_active'      => $isActive,
-                'description'    => $description,   // <-- NEW
-            ];
-
-            if ($this->voucherModel->save($data)) {
-                return redirect()->to('/discounts/list')->with('success', 'Voucher created successfully.');
-            }
-
-            // Model-level errors (unique code, etc.)
-            return redirect()->back()
-                ->withInput()
-                ->with('error', 'Failed to save voucher: ' . implode('; ', (array) $this->voucherModel->errors()));
-        }
-
-        return view('discounts/create');
-    }
-
-
-    public function editVoucher($id)
-    {
-        $voucher = $this->voucherModel->find($id);
-
-        if (!$voucher) {
-            return redirect()->to('discounts/list')->with('error', 'Voucher not found');
-        }
-
-        if (strtolower($this->request->getMethod()) === 'post') {
-            $data = [
-                'id' => $id,
-                'code' => $this->request->getPost('code'),
-                'discount_type' => $this->request->getPost('discount_type'),
-                'discount_value' => $this->request->getPost('discount_value'),
-                'max_uses' => $this->request->getPost('max_uses'),
-                'valid_from' => $this->request->getPost('valid_from') ?: null,
-                'valid_until' => $this->request->getPost('valid_until') ?: null,
-                'is_active' => $this->request->getPost('is_active') ? 1 : 0,
-            ];
-
-            $this->voucherModel->save($data);
-            return redirect()->to('discounts/list')->with('success', 'Voucher updated successfully');
-        }
-
-        return view('discounts/edit', ['voucher' => $voucher]);
-    }
-
-    /**
-     * 🔄 Helper: Current invoice balance (school-year scoped) = total - payments - discounts - refundsPaid
-     */
-    private function getCurrentInvoiceBalance($invoiceId, $schoolYear)
-    {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) return 0.0;
-
-        // Payments (exclude void/refund/failed, honor year)
-        $qb = $this->paymentModel
-            ->select('COALESCE(SUM(paid_amount),0) AS total_paid')
-            ->where('invoice_id', $invoiceId)
-            ->where('school_year', $schoolYear);
-
-        $table = $this->paymentModel->table;
-        $hasStatus = $this->db->fieldExists('status', $table);
-        $hasVoid   = $this->db->fieldExists('is_void', $table);
-        if ($hasStatus) {
-            $qb->groupStart()
-                ->whereNotIn('status', ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'])
-                ->orWhere('status IS NULL', null, false)
-            ->groupEnd();
-        }
-        if ($hasVoid) {
-            $qb->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-            ->groupEnd();
-        }
-        $rowPaid   = $qb->first();
-        $totalPaid = (float)($rowPaid['total_paid'] ?? 0);
-
-        // Discounts for this invoice in this year
-        $rowDisc = $this->db->table('discount_usages du')
-            ->select('COALESCE(SUM(du.discount_amount),0) AS total_disc')
-            ->join('invoices i', 'i.id = du.invoice_id')
-            ->where('du.invoice_id', $invoiceId)
-            ->where('i.school_year', $schoolYear)
-            ->get()->getRowArray();
-        $totalDisc = (float)($rowDisc['total_disc'] ?? 0);
-
-        // Refunds PAID for this invoice in this year
-        $rowRefund = $this->db->table('refunds')
-            ->select('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
-            ->where('invoice_id', $invoiceId)
-            ->where('school_year', $schoolYear)
-            ->whereIn('status', ['Partial', 'Paid'])
-            ->get()->getRowArray();
-        $totalRefundPaid = (float)($rowRefund['total_refund_paid'] ?? 0);
-
-        $total = (float)($invoice['total_amount'] ?? 0);
-        return max(0.0, round($total - $totalPaid - $totalDisc - $totalRefundPaid, 2));
-    }
-
-    /**
-     * 🔄 Recalculate invoice totals and status based on all payments for current school year
-     */
-    private function recalculateInvoice($invoiceId, $schoolYear): void
-    {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) return;
-
-        $parentId = (int)($invoice['parent_id'] ?? 0);
-        if ($parentId <= 0) return;
-
-        // ---- Tuition (recompute from enrollments) ----
-        $enrollments = $this->enrollmentModel
-            ->where('parent_id', $parentId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $registered = [];
-        $withdrawn  = [];
-        foreach ($enrollments as $e) {
-            $row = [
-                'student_id'       => (int)($e['student_id'] ?? 0),
-                'class_section_id' => $e['class_section_id'] ?? null,
-                'enrollment_status'=> (string)($e['enrollment_status'] ?? ''),
-            ];
-            if (in_array($row['enrollment_status'], ['enrolled','payment pending'], true)) {
-                $registered[] = $row;
-            } elseif (in_array($row['enrollment_status'], ['withdrawn','refund pending','withdraw under review'], true)) {
-                $withdrawn[] = $row;
-            }
-        }
-
-        // Refund window check – if after deadline, withdrawn still billed
-        $refundDeadline = (string)($this->configModel->getConfig('refund_deadline') ?? '');
-        $refundAllowed  = true;
-        try {
-            $tzName   = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-            $tz       = new \DateTimeZone($tzName);
-            $today    = new \DateTimeImmutable('today', $tz);
-            $deadline = new \DateTimeImmutable($refundDeadline, $tz);
-            $refundAllowed = $today <= $deadline;
-        } catch (\Throwable $e) {
-            $refundAllowed = true;
-        }
-
-        $tuitionStudents = $registered;
-        if (!$refundAllowed) {
-            $tuitionStudents = array_merge($tuitionStudents, $withdrawn);
-        }
-
-        // Grade threshold and fees
-        $gradeFee         = (int)($this->configModel->getConfig('grade_fee') ?? 9);
-        $firstStudentFee  = (float)($this->configModel->getConfig('first_student_fee')  ?? 350);
-        $secondStudentFee = (float)($this->configModel->getConfig('second_student_fee') ?? 200);
-        $youthFee         = (float)($this->configModel->getConfig('youth_fee')          ?? 180);
-
-        // Normalize grades for tuition students
-        foreach ($tuitionStudents as &$s) {
-            $name = null;
-            if (!empty($s['class_section_id'])) {
-                $name = $this->classSectionModel->getClassSectionNameBySectionId($s['class_section_id']);
-            }
-            $s['grade_name'] = is_string($name) ? strtoupper(trim($name)) : 'N/A';
-        }
-        unset($s);
-
-        // Count regular vs youth and compute tuition
-        $regularCount = 0;
-        $youthCount   = 0;
-        foreach ($tuitionStudents as $s) {
-            $lvl = $this->parseGradeLevel($s['grade_name']);
-            if ($lvl > $gradeFee) $youthCount++; else $regularCount++;
-        }
-
-        $tuitionSubtotal = 0.0;
-        $tuitionSubtotal += $youthCount * $youthFee;
-        if ($regularCount >= 2) {
-            $tuitionSubtotal += $firstStudentFee + ($regularCount - 1) * $secondStudentFee;
-        } elseif ($regularCount === 1) {
-            $tuitionSubtotal += $firstStudentFee;
-        }
-
-        // ---- Event charges (parent-year) ----
-        $eventSubtotal = 0.0;
-        try {
-            $events = $this->eventChargesModel->getChargesWithEventInfo($parentId, $schoolYear) ?? [];
-            foreach ($events as $ev) { $eventSubtotal += (float)($ev['charged'] ?? 0.0); }
-        } catch (\Throwable $e) {}
-
-        // ---- Additional charges (per-invoice) ----
-        $additionalSubtotal = 0.0;
-        try {
-            $rows = $this->additionalChargeModel
-                ->select('charge_type, amount')
-                ->where('invoice_id', $invoiceId)
-                ->where('status', 'applied')
-                ->findAll();
-            foreach ($rows as $r) {
-                $amt = (float)($r['amount'] ?? 0);
-                $typ = strtolower((string)($r['charge_type'] ?? 'add'));
-                if ($typ === 'deduct') $amt = -abs($amt); else $amt = abs($amt);
-                $additionalSubtotal += $amt;
-            }
-        } catch (\Throwable $e) {}
-
-        $newTotal = round($tuitionSubtotal + $eventSubtotal + $additionalSubtotal, 2);
-
-        // ---- Payments / Discounts / Refunds ----
-        $db        = $this->db;
-        $table     = $this->paymentModel->table;
-        $hasStatus = $db->fieldExists('status', $table);
-        $hasVoid   = $db->fieldExists('is_void', $table);
-        $exclude   = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-
-        $qb = $this->paymentModel
-            ->where('invoice_id', $invoiceId)
-            ->where('school_year', $schoolYear);
-
-        if ($hasStatus) {
-            $qb->groupStart()
-                ->whereNotIn('status', $exclude)
-                ->orWhere('status IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($hasVoid) {
-            $qb->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        $payments = $qb->findAll();
-        $totalPaid = 0.0;
-        foreach ($payments as $p) { $totalPaid += (float)($p['paid_amount'] ?? 0); }
-
-        $discRow = $this->db->table('discount_usages')
-            ->select('COALESCE(SUM(discount_amount),0) AS total_disc')
-            ->where('invoice_id', $invoiceId)
-            ->get()->getRowArray();
-        $totalDisc = (float)($discRow['total_disc'] ?? 0);
-
-        $refundRow = $this->db->table('refunds')
-            ->select('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
-            ->where('invoice_id', $invoiceId)
-            ->whereIn('status', ['Partial','Paid'])
-            ->get()->getRowArray();
-        $totalRefundPaid = (float)($refundRow['total_refund_paid'] ?? 0);
-
-        $newBalance = max(0.0, $newTotal - $totalDisc - $totalPaid - $totalRefundPaid);
-        $newStatus  = ($newBalance <= 0.00001) ? 'Paid' : (($totalPaid > 0) ? 'Partially Paid' : 'Unpaid');
-
-        $updateData = [
-            'total_amount' => $newTotal,
-            'paid_amount'  => $totalPaid,
-            'balance'      => $newBalance,
-            'status'       => $newStatus,
-            'has_discount' => ($totalDisc > 0.0) ? 1 : 0,
-        ];
-
-        if ($this->db->fieldExists('discount', $this->invoiceModel->table)) {
-            $updateData['discount'] = $totalDisc;
-        }
-
-        $this->invoiceModel->update($invoiceId, $updateData);
-    }
-
-    /**
-     * Parse a grade name into an integer level for tuition rules.
-     * Kindergarten -> 1, Youth -> > 9, numeric grades passthrough.
-     */
-    private function parseGradeLevel($grade): int
-    {
-        if (is_numeric($grade)) return (int)$grade;
-        if (!is_string($grade)) return 999;
-        $g = strtoupper(trim((string)$grade));
-        $g = preg_replace('/\s+/', ' ', $g);
-        $g = str_replace(['.', '_', '-'], ['', '', ' '], $g);
-        // KG/K/Kindergarten
-        $kg = ['K','KG','K G','KINDER','KINDERGARTEN'];
-        if (in_array($g, $kg, true)) return 1;
-        // Pre-K -> treat below regular
-        $pk = ['PK','P K','PREK','PRE K','PRE KINDER','PREKINDER'];
-        if (in_array($g, $pk, true)) return -1;
-        // Youth variants: Y, YOUTH, Y1, YOUTH2 -> map to 10+
-        if (preg_match('/^Y(?:OUTH)?\s*(\d+)?$/', $g, $m)) {
-            $n = isset($m[1]) && $m[1] !== '' ? max(1, (int)$m[1]) : 1;
-            $gradeFee = (int)($this->configModel->getConfig('grade_fee') ?? 9);
-            return $gradeFee + $n;
-        }
-        if (preg_match('/^(?:GR?ADE\s*)?(\d{1,2})\s*([A-Z]*)$/', $g, $m)) {
-            return (int)$m[1];
-        }
-        return 999;
-    }
-
-    /**
-     * Collect parent/invoice/payment data to trigger handlePaymentReceived().
-     *
-     * @return array [$data, $studentdata]
-     */
-    private function buildPaymentEventData(
-        int $invoiceId,
-        string $transactionIdOrRef,
-        float $amount,
-        string $paymentMethod,
-        string $paymentDate,
-        ?string $checkNumber,
-        int $installmentSeq,
-        float $preBalance,     // ✅ new param: initial (pre-payment) balance
-        float $postBalance     // ✅ new param: computed post-payment balance
-    ): array {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) {
-            throw new \RuntimeException("Invoice {$invoiceId} not found");
-        }
-
-        $parentRow = $this->db->table('users')
-            ->select('id, firstname, lastname, email')
-            ->where('id', $invoice['parent_id'])
-            ->get()
-            ->getRowArray();
-
-        if (!$parentRow) {
-            throw new \RuntimeException("Parent not found for invoice {$invoiceId}");
-        }
-
-        // Students (adjust joins to your schema)
-        $studentRows = $this->db->table('students s')
-            ->select('s.id, s.firstname, s.lastname, sc.class_section_id')
-            ->join('student_class sc', 'sc.student_id = s.id', 'left')
-            ->where('s.parent_id', $invoice['parent_id'])
-            ->where('sc.school_year', $this->schoolYear)
-            ->get()
-            ->getResultArray();
-
-        $data = [
-            'user_id'         => (int) $parentRow['id'],
-            'email'           => $parentRow['email'],
-            'firstname'       => $parentRow['firstname'],
-            'lastname'        => $parentRow['lastname'],
-            'school_year'     => $this->schoolYear,
-            'semester'        => $this->semester,
-            'invoice_id'      => $invoiceId,
-            'transaction_id'  => $transactionIdOrRef,
-            'payment_date'    => $paymentDate,
-            'amount'          => $amount,
-            'method'          => $paymentMethod,
-            'check_number'    => $checkNumber,
-            'installment_seq' => $installmentSeq,
-            'invoice_total'   => (float) $invoice['total_amount'],
-            'pre_balance'     => $preBalance,   // ✅ the captured pre-payment balance
-            'post_balance'    => $postBalance,  // ✅ computed post-payment balance
-            'portalLink'      => site_url('parent/invoices/' . $invoiceId),
-        ];
-
-        return [$data, $studentRows];
-    }
-}
diff --git a/app/Http/Controllers/old/EmailService.php b/app/Http/Controllers/old/EmailService.php
new file mode 100644
index 00000000..3a06d438
--- /dev/null
+++ b/app/Http/Controllers/old/EmailService.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Services;
+
+use App\Controllers\View\EmailController;
+
+class EmailService
+{
+    protected array $senders;
+    protected EmailController $mailer;
+
+    public function __construct()
+    {
+        $json = env('MAIL_SENDERS', '{}');
+        $decoded = json_decode($json, true);
+        $this->senders = is_array($decoded) ? $decoded : [];
+        $this->mailer  = new EmailController();
+    }
+
+    protected function getSenderDetails(string $fromKey = 'general'): array
+    {
+        $senders = $this->senders;
+        if (isset($senders[$fromKey])) {
+            return $senders[$fromKey];
+        }
+        return $senders['general'] ?? [
+            'email' => getenv('SMTP_USER') ?: 'no-reply@alrahmaisgl.org',
+            'name'  => 'Al Rahma Sunday School',
+        ];
+    }
+
+    /** NEW: expose configured sender keys to build a dropdown in the UI */
+    public function listSenders(): array
+    {
+        // returns: ['general' => ['email' => '...', 'name' => '...'], 'finance' => [...], ...]
+        return $this->senders ?: [
+            'general' => [
+                'email' => getenv('SMTP_USER') ?: 'no-reply@alrahmaisgl.org',
+                'name'  => 'Al Rahma Sunday School',
+            ],
+        ];
+    }
+
+    /**
+     * Send a single HTML email.
+     * Backward-compatible: you can ignore $attachments/$headers.
+     */
+    public function send(string $to, string $subject, string $message, string $fromKey = 'general', array $attachments = [], array $headers = []): bool
+    {
+        $attachmentsPayload = $this->normalizeAttachments($attachments);
+        // Headers are ignored by EmailController but kept for interface compatibility.
+        return $this->mailer->sendEmail($to, $subject, $message, $fromKey, null, null, $attachmentsPayload);
+    }
+
+    /**
+     * NEW: BCC bulk send in a single SMTP call (To must be non-empty; we use the SMTP user).
+     */
+    public function sendBcc(array $bccList, string $subject, string $message, string $fromKey = 'general', array $attachments = [], array $headers = []): bool
+    {
+        if (empty($bccList)) {
+            return true; // nothing to send
+        }
+
+        $attachmentsPayload = $this->normalizeAttachments($attachments);
+        $allOk = true;
+        foreach ($bccList as $addr) {
+            $ok = $this->mailer->sendEmail($addr, $subject, $message, $fromKey, null, null, $attachmentsPayload);
+            if (!$ok) {
+                $allOk = false;
+                log_message('error', 'EmailService::sendBcc failed for ' . $addr);
+            }
+        }
+        return $allOk;
+    }
+
+    /**
+     * Normalize various attachment inputs to the format expected by EmailController.
+     */
+    private function normalizeAttachments(array $attachments): array
+    {
+        $out = [];
+        foreach ($attachments as $file) {
+            if (is_object($file) && method_exists($file, 'isValid') && $file->isValid()) {
+                $newName = $file->getRandomName();
+                $path = WRITEPATH . 'uploads/' . $newName;
+                $file->move(WRITEPATH . 'uploads', $newName, true);
+                $out[] = ['path' => $path, 'name' => $file->getClientName()];
+            } elseif (is_string($file) && is_file($file)) {
+                $out[] = ['path' => $file, 'name' => basename($file)];
+            } elseif (is_array($file) && !empty($file['path'])) {
+                $out[] = ['path' => $file['path'], 'name' => $file['name'] ?? basename($file['path'])];
+            }
+        }
+        return $out;
+    }
+}
diff --git a/app/Http/Controllers/old/ExpenseController.php b/app/Http/Controllers/old/ExpenseController.php
deleted file mode 100644
index 01bd5d33..00000000
--- a/app/Http/Controllers/old/ExpenseController.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use App\Models\ExpenseModel;
-use App\Models\UserModel;
-use App\Models\ConfigurationModel;
-use CodeIgniter\Exceptions\PageNotFoundException;
-
-class ExpenseController extends BaseController
-{
-    protected $expenseModel;
-    protected $userModel;
-    protected $configModel;
-    protected $schoolYear;
-    protected $semester;
-    protected $retailors;
-
-    public function __construct()
-    {
-        $this->expenseModel = new ExpenseModel();
-        $this->userModel    = new UserModel();
-        $this->configModel  = new ConfigurationModel();
-
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester   = $this->configModel->getConfig('semester');
-
-        // Default list of common retailors; adjust as needed
-        $this->retailors = [
-            'Amazon',
-            'Walmart',
-            'Costco',
-            'BJ\'s',
-            'Market Basket',
-            'Aldi',
-            'Hannaford',
-            'Sam\'s Club',
-            'HomeGoods',
-            'Hostinger',
-            'Wicked Cheesy',
-            'Shatila',
-            'Brothers Pizzeria',
-            'Paradise Biryani Pointe',
-            'Emad Leiman',
-            'Nova Trampoline Park',
-            'Lubin\'s Awards',
-            'Dollar Tree',
-            'Stop & Shop',
-            'Dunkin\' Donuts',
-            'Giovanni\'s Pizza',
-            'Trader Joes'
-        ];
-    }
-
-    /**
-     * Return staff users (admins/teachers/etc.) excluding parents/guests.
-     */
-    private function staffUsers(): array
-    {
-        $rows = $this->userModel
-            ->select('users.id, users.firstname, users.lastname, roles.name AS role_name')
-            ->join('user_roles', 'user_roles.user_id = users.id', 'left')
-            ->join('roles', 'roles.id = user_roles.role_id', 'left')
-            ->where('roles.name IS NOT NULL', null, false)
-            ->findAll();
-
-        $excludedRoles = array_map('strtolower', ['parent', 'student', 'guest']);
-        $staff = [];
-
-        foreach ($rows as $row) {
-            $roleName = strtolower((string) ($row['role_name'] ?? ''));
-            $id       = (int) ($row['id'] ?? 0);
-            if ($id <= 0 || in_array($roleName, $excludedRoles, true)) {
-                continue;
-            }
-            if (!isset($staff[$id])) {
-                $staff[$id] = [
-                    'id'        => $id,
-                    'firstname' => $row['firstname'] ?? '',
-                    'lastname'  => $row['lastname'] ?? '',
-                ];
-            }
-        }
-
-        uasort($staff, static function ($a, $b) {
-            $nameA = trim(($a['firstname'] ?? '') . ' ' . ($a['lastname'] ?? ''));
-            $nameB = trim(($b['firstname'] ?? '') . ' ' . ($b['lastname'] ?? ''));
-            return strcasecmp($nameA, $nameB);
-        });
-
-        return array_values($staff);
-    }
-
-    public function index()
-    {
-        $expenses = $this->expenseModel
-            ->select("
-                expenses.*,
-                u.firstname AS purchaser_firstname, u.lastname AS purchaser_lastname,
-                approver.firstname AS approver_firstname, approver.lastname AS approver_lastname
-            ")
-            ->join('users u', 'u.id = expenses.purchased_by', 'left')
-            ->join('users approver', 'approver.id = expenses.approved_by', 'left')
-            ->orderBy('expenses.created_at', 'DESC')
-            ->findAll();
-
-        // Enrich each row with a URL that goes through Files::receipt($name)
-        // We store only the filename in 'receipt_path' (e.g., "1759...f62.png")
-        $expenses = array_map(function ($row) {
-            $name = $row['receipt_path'] ?? null;
-            $row['receipt_url'] = $this->receiptUrl($name);
-            return $row;
-        }, $expenses);
-
-        return view('expenses/index', ['expenses' => $expenses]);
-    }
-
-    public function create()
-    {
-        $users = $this->staffUsers();
-
-        return view('expenses/create', [
-            'users'     => $users,
-            'retailors' => $this->retailors,
-        ]);
-    }
-
-    public function store()
-    {
-        $rules = [
-            'category'     => 'required|in_list[Expense,Purchase,Reimbursement,Donation]',
-            'amount'       => 'required|decimal|greater_than[0]',
-            // Frontend sends purchased_by as "id|Full Name"
-            'purchased_by' => 'required',
-            // Optional extra fields
-            'retailor'         => 'permit_empty|max_length[255]',
-            'date_of_purchase' => 'permit_empty',
-            // allow JPG/JPEG/PNG/WEBP/GIF and PDF up to 2MB
-            'receipt'      => 'uploaded[receipt]'
-                . '|max_size[receipt,2048]'
-                . '|ext_in[receipt,jpg,jpeg,png,webp,gif,pdf]'
-                . '|mime_in[receipt,image/jpg,image/jpeg,image/png,image/webp,image/gif,application/pdf]',
-        ];
-
-        $messages = [
-            'receipt' => [
-                'uploaded' => 'Receipt file is required.',
-                'max_size' => 'Maximum file size is 2MB.',
-                'ext_in'   => 'Allowed formats: JPG, JPEG, PNG, WEBP, GIF, or PDF.',
-                'mime_in'  => 'Allowed formats: JPG, JPEG, PNG, WEBP, GIF, or PDF.',
-            ]
-        ];
-
-        if (!$this->validate($rules, $messages)) {
-            return redirect()->back()->withInput()->with('error', $this->validator->listErrors());
-        }
-
-        // Safe values
-        $category    = (string) $this->request->getPost('category');
-        $amount      = (string) $this->request->getPost('amount');
-        $description = (string) $this->request->getPost('description');
-        $retailor    = trim((string) $this->request->getPost('retailor'));
-        $datePurchase = (string) $this->request->getPost('date_of_purchase');
-        $userId      = (int) (session()->get('user_id') ?? 0);
-        $isDonation  = ($category === 'Donation');
-
-        // Parse "purchased_by" as "7|John Doe"
-        $purchasedInfo = (string) $this->request->getPost('purchased_by');
-        [$purchasedById, $purchasedByName] = array_pad(explode('|', $purchasedInfo, 2), 2, null);
-        $purchasedById = (int) $purchasedById;
-
-        // School context
-        $schoolYear = $this->schoolYear ?: date('Y');
-        $semester   = $this->semester ?: 'Fall';
-
-        // Handle upload: store under writable/uploads/receipts and save only the filename
-        $receiptName = null;
-        $file = $this->request->getFile('receipt');
-        if ($file && $file->isValid() && !$file->hasMoved()) {
-            $stored      = $file->store('receipts'); // -> writable/uploads/receipts/<randomname>.ext
-            $receiptName = basename($stored);
-        }
-
-        $status       = $isDonation ? 'approved' : 'pending';
-        $statusReason = $isDonation ? 'Marked as Donation (non-reimbursable).' : null;
-
-        $this->expenseModel->insert([
-            'category'     => $category,
-            'amount'       => $amount,
-            'receipt_path' => $receiptName, // filename only
-            'description'  => $description,
-            'retailor'     => ($retailor !== '') ? $retailor : null,
-            'date_of_purchase' => ($datePurchase !== '') ? $datePurchase : null,
-            'purchased_by' => $purchasedById,
-            'added_by'     => $userId,
-            'status'       => $status,
-            'status_reason'=> $statusReason,
-            'approved_by'  => $isDonation ? $userId : null,
-            'school_year'  => $schoolYear,
-            'semester'     => $semester,
-        ]);
-
-        return redirect()->to('/expenses/index')->with('success', 'Record added successfully!');
-    }
-
-
-    public function updateStatus()
-    {
-        $data   = $this->request->getJSON(true);
-        $id     = isset($data['id']) ? (int)$data['id'] : null;
-        $status = $data['status'] ?? null;
-        $reason = $data['reason'] ?? '';
-        $userId = (int) (session()->get('user_id') ?? 0);
-
-        if (!$id || !in_array($status, ['approved', 'denied'], true)) {
-            log_message('error', 'Invalid status or ID');
-            return $this->response->setJSON(['error' => 'Invalid data']);
-        }
-
-        $expense = $this->expenseModel->find($id);
-        if (!$expense) {
-            log_message('error', 'Expense not found for ID ' . $id);
-            return $this->response->setJSON(['error' => 'Expense not found']);
-        }
-
-        $success = $this->expenseModel->update($id, [
-            'status'        => $status,
-            'status_reason' => $reason,
-            'approved_by'   => $userId,
-            'updated_by'    => $userId
-        ]);
-
-        if (!$success) {
-            log_message('error', 'Expense update failed for ID ' . $id);
-            return $this->response->setJSON(['error' => 'Update failed']);
-        }
-
-        return $this->response->setJSON(['success' => true]);
-    }
-
-    /**
-     * Build a public URL for a receipt filename through Files::receipt($name).
-     * Expects just the filename (e.g., "1759113425_1c443e607e1900f92f62.png").
-     */
-    private function receiptUrl(?string $filename): ?string
-    {
-        if (!$filename) {
-            return null;
-        }
-        // Route should be defined as: $routes->get('receipts/(:any)', 'Files::receipt/$1');
-        return site_url('receipts/' . $filename);
-    }
-
-
-
-    public function edit(int $id)
-    {
-        $expense = $this->expenseModel->find($id);
-        if (!$expense) {
-            throw PageNotFoundException::forPageNotFound("Expense #$id not found");
-        }
-
-        // same user list you use in create()
-        $users = $this->staffUsers();
-
-        return view('expenses/edit', [
-            'expense'     => $expense,
-            'users'       => $users,
-            'retailors'   => $this->retailors,
-            'receipt_url' => $expense['receipt_path'] ? site_url('receipts/' . basename($expense['receipt_path'])) : null,
-        ]);
-    }
-
-    public function update(int $id)
-    {
-        helper(['form']);
-
-        $expense = $this->expenseModel->find($id);
-        if (!$expense) {
-            throw PageNotFoundException::forPageNotFound("Expense #$id not found");
-        }
-
-        // Base rules
-        $rules = [
-            'category'     => 'required|in_list[Expense,Purchase,Reimbursement,Donation]',
-            'amount'       => 'required|decimal|greater_than[0]',
-            'purchased_by' => 'required', // still "id|Full Name"
-            'retailor'         => 'permit_empty|max_length[255]',
-            'date_of_purchase' => 'permit_empty',
-        ];
-
-        // Optional new receipt validation (only if provided)
-        $file = $this->request->getFile('receipt');
-        if ($file && $file->isValid() && ($file->getSize() ?? 0) > 0) {
-            $rules['receipt'] = 'max_size[receipt,2048]'
-                . '|ext_in[receipt,jpg,jpeg,png,webp,gif,pdf]'
-                . '|mime_in[receipt,image/jpg,image/jpeg,image/png,image/webp,image/gif,application/pdf]';
-        }
-
-        if (!$this->validate($rules)) {
-            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
-        }
-
-        // Parse "id|Name"
-        [$purchasedById] = array_pad(explode('|', (string) $this->request->getPost('purchased_by'), 2), 2, null);
-        $purchasedById = (int) $purchasedById;
-        $category   = (string) $this->request->getPost('category');
-        $isDonation = ($category === 'Donation');
-        $userId     = (int) (session()->get('user_id') ?? 0);
-
-        // Keep old receipt unless replaced or removed
-        $receiptName = $expense['receipt_path'];
-        if ($file && $file->isValid() && !$file->hasMoved() && ($file->getSize() ?? 0) > 0) {
-            $stored      = $file->store('receipts');
-            $receiptName = basename($stored);
-        }
-        if ($this->request->getPost('remove_receipt') === '1') {
-            $receiptName = null;
-        }
-
-        $updateData = [
-            'category'     => $category,
-            'amount'       => (string) $this->request->getPost('amount'),
-            'description'  => (string) $this->request->getPost('description'),
-            'retailor'     => trim((string) $this->request->getPost('retailor')) ?: null,
-            'date_of_purchase' => (string) $this->request->getPost('date_of_purchase') ?: null,
-            'purchased_by' => $purchasedById,
-            'receipt_path' => $receiptName,
-            'updated_by'   => $userId,
-        ];
-
-        if ($isDonation) {
-            $updateData['status']           = 'approved';
-            $updateData['status_reason']    = 'Marked as Donation (non-reimbursable).';
-            $updateData['approved_by']      = $userId ?: null;
-            $updateData['reimbursement_id'] = null;
-        } elseif (($expense['category'] ?? '') === 'Donation') {
-            // Moving a donation back to a reimbursable category: clear the marker.
-            $updateData['status_reason'] = null;
-            $updateData['approved_by']   = $expense['approved_by'] ?? null;
-            $updateData['status']        = $expense['status'] ?? 'pending';
-        }
-
-        $this->expenseModel->update($id, $updateData);
-
-        return redirect()->to('/expenses/index')->with('success', 'Expense updated.');
-    }
-}
diff --git a/app/Http/Controllers/old/ExtraChargesController.php b/app/Http/Controllers/old/ExtraChargesController.php
deleted file mode 100644
index 37cd2bf0..00000000
--- a/app/Http/Controllers/old/ExtraChargesController.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\AdditionalChargeModel;
-use CodeIgniter\Controller;
-use App\Models\UserModel;
-use App\Models\ConfigurationModel;
-use CodeIgniter\Events\Events;
-use App\Models\InvoiceModel;
-use CodeIgniter\I18n\Time;
-
-class ExtraChargesController extends BaseController
-{
-    protected $additionalChargeModel;
-    protected $db;
-    protected $configModel;
-    protected $semester;
-    protected $schoolYear;
-    protected $attendanceDataModel;
-    protected $studentModel;
-    protected $emergencyContactModel;
-    protected $userModel;
-    protected $teacherClassSection;
-    protected $invoiceModel;
-    protected $classSectionModel;
-    protected $studentClassModel;
-    protected $enableAttendance;
-    protected $attendanceDayModel;
-
-    public function __construct()
-    {
-        // Initialize the database connection in the constructor
-        $this->db = \Config\Database::connect();
-        $this->configModel = new ConfigurationModel();
-        $this->additionalChargeModel = new AdditionalChargeModel();
-        $this->userModel = new UserModel();
-        $this->invoiceModel = new InvoiceModel();
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-    }
-
-    public function index()
-    {
-        // API-first: delegate to JSON list endpoint
-        return $this->apiList();
-    }
-
-    /** Render HTML management page */
-    public function page()
-    {
-        $parentId   = (int)($this->request->getGet('parent_id') ?? 0);
-        $status     = $this->request->getGet('status') ?: null;
-        $yearSelect = (string)($this->request->getGet('school_year') ?? $this->schoolYear);
-
-        $rows = [];
-        if ($parentId > 0) {
-            $rows = $this->additionalChargeModel
-                ->byParentTerm($parentId, $this->schoolYear, $this->semester, $status);
-        }
-
-        // Load ALL parents for current view
-        $parents = $this->userModel->select('users.id, users.firstname, users.lastname')
-            ->join('user_roles', 'user_roles.user_id = users.id')
-            ->join('roles', 'roles.id = user_roles.role_id')
-            ->where('LOWER(roles.name) =', 'parent')
-            ->where('user_roles.deleted_at IS NULL', null, false)
-            ->orderBy('users.lastname', 'ASC')
-            ->orderBy('users.firstname', 'ASC')
-            ->findAll();
-
-        // Map parent id -> "Lastname, Firstname" (no email/ID shown)
-        $parentMap = [];
-        foreach ($parents as $p) {
-            $label = trim(($p['lastname'] ?? '') . ', ' . ($p['firstname'] ?? ''));
-            $parentMap[(int)$p['id']] = $label !== '' && $label !== ',' ? $label : ('User #' . (int)$p['id']);
-        }
-
-        // 🔹 Get ALL invoices for ALL parents this year, group by parent_id
-        $parentIds = array_map(fn($r) => (int)$r['id'], $parents);
-        $invoicesByParent = [];
-        if (!empty($parentIds)) {
-            $all = $this->invoiceModel->getAllInvoicesByUserIds($parentIds, $yearSelect);
-            foreach ($all as $inv) {
-                $pid = (int)$inv['parent_id'];
-                $invoicesByParent[$pid][] = [
-                    'id'             => (int)$inv['id'],
-                    'invoice_number' => (string)$inv['invoice_number'],
-                    'status'         => (string)($inv['status'] ?? ''),
-                    'balance'        => (float)($inv['balance'] ?? 0),
-                    'issue_date'     => $inv['issue_date'] ?? null,
-                ];
-            }
-        }
-
-        // Label for preselect (if filtering by a parent)
-        $selectedParentLabel = ($parentId > 0 && isset($parentMap[$parentId])) ? $parentMap[$parentId] : '';
-
-        // Optional filters
-        $status = $this->request->getGet('status') ?: null;
-        $q      = trim((string)($this->request->getGet('q') ?? ''));
-
-        // ✅ Always pull all charges for the selected year & current semester (all parents)
-        $rows   = $this->additionalChargeModel->listAllForTerm(
-            $yearSelect,
-            $this->semester,
-            $status,
-            $q,
-            50 // per-page
-        );
-        $pager  = $this->additionalChargeModel->pager;
-
-        // Build school year options from data (additional_charges + invoices)
-        $schoolYears = [];
-        try {
-            $q1 = $this->db->table('additional_charges')->select('DISTINCT school_year', false)
-                ->where('school_year IS NOT NULL', null, false)
-                ->orderBy('school_year', 'DESC')->get()->getResultArray();
-            foreach ($q1 as $r) {
-                $val = (string)($r['school_year'] ?? '');
-                if ($val !== '' && !in_array($val, $schoolYears, true)) $schoolYears[] = $val;
-            }
-        } catch (\Throwable $e) {}
-        try {
-            $q2 = $this->db->table('invoices')->select('DISTINCT school_year', false)
-                ->where('school_year IS NOT NULL', null, false)
-                ->orderBy('school_year', 'DESC')->get()->getResultArray();
-            foreach ($q2 as $r) {
-                $val = (string)($r['school_year'] ?? '');
-                if ($val !== '' && !in_array($val, $schoolYears, true)) $schoolYears[] = $val;
-            }
-        } catch (\Throwable $e) {}
-        if (empty($schoolYears) && is_string($this->schoolYear) && $this->schoolYear !== '') {
-            // fallback: generate recent years around configured schoolYear
-            $schoolYears[] = $this->schoolYear;
-            // Optionally add previous/next
-            [$start, $end] = explode('-', $this->schoolYear) + [0 => date('Y'), 1 => date('Y')+1];
-            $start = (int)$start;
-            for ($i = 1; $i <= 3; $i++) {
-                $schoolYears[] = ($start - $i) . '-' . (($start - $i) + 1);
-            }
-        }
-        rsort($schoolYears);
-
-        return view('payment/extra_charges', [
-            'q'          => $q,
-            'pager'      => $pager,
-            'rows'                => $rows,
-            'parents'             => $parents,
-            'parentMap'           => $parentMap,
-            'invoicesByParent'    => $invoicesByParent, // 🔹 pass the grouped map
-            'parentId'            => $parentId,
-            'selectedParentLabel' => $selectedParentLabel,
-            'status'              => $status,
-            'schoolYear'          => $yearSelect,
-            'schoolYears'         => $schoolYears,
-            'semester'            => $this->semester,
-        ]);
-    }
-
-    private function wantsJson(): bool
-    {
-        $accept = strtolower((string)($this->request->getHeaderLine('Accept') ?? ''));
-        return $this->request->isAJAX() || str_contains($accept, 'application/json');
-    }
-
-    /** Used by Select2 AJAX: returns {results:[{id,text}]} */
-    public function parentOptions()
-    {
-        $q     = trim((string)($this->request->getGet('q') ?? ''));
-        $limit = 20;
-
-        $builder = $this->userModel
-            ->select('users.id, users.firstname, users.lastname, users.email')
-            ->join('user_roles', 'user_roles.user_id = users.id')
-            ->join('roles', 'roles.id = user_roles.role_id')
-            // If your role name may have different case, use LOWER(...):
-            // ->where('LOWER(roles.name) =', 'parent')
-            ->where('roles.name', 'parent')
-            // Make sure this produces IS NULL; if not, use the raw condition line below
-            ->where('user_roles.deleted_at', null);
-
-        // Alternative guaranteed-IS-NULL:
-        // $builder->where('user_roles.deleted_at IS NULL', null, false);
-
-        if ($q !== '') {
-            $builder->groupStart()
-                ->like('users.firstname', $q)
-                ->orLike('users.lastname', $q)
-                ->orLike('users.email', $q)
-                ->groupEnd();
-        }
-
-        $rows = $builder
-            ->orderBy('users.lastname', 'ASC')
-            ->orderBy('users.firstname', 'ASC')
-            ->limit($limit)
-            ->find();
-
-        $results = array_map(function ($r) {
-            $name  = trim(($r['lastname'] ?? '') . ', ' . ($r['firstname'] ?? ''));
-            $email = $r['email'] ?? '';
-            $label = $name !== ',' ? $name : ('User #' . $r['id']);
-            if ($email) $label .= ' — ' . $email;
-            $label .= ' (ID: ' . $r['id'] . ')';
-            return ['id' => (int)$r['id'], 'text' => $label];
-        }, $rows);
-
-        return $this->response->setJSON(['results' => $results]);
-    }
-
-    /** Helper for preselect label in the modal */
-    private function getParentLabel(int $id): string
-    {
-        $p = $this->userModel->select('firstname, lastname, email')->find($id);
-        if (!$p) return 'User #' . $id;
-        $name  = trim(($p['lastname'] ?? '') . ', ' . ($p['firstname'] ?? ''));
-        $email = $p['email'] ?? '';
-        $label = $name !== ',' ? $name : ('User #' . $id);
-        if ($email) $label .= ' — ' . $email;
-        return $label . ' (ID: ' . $id . ')';
-    }
-
-    public function update($id)
-    {
-        $row = $this->additionalChargeModel->find($id);
-        if (!$row) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Charge not found', 'csrf_token' => csrf_token(), 'csrf_hash' => csrf_hash()]);
-            return redirect()->back()->with('error', 'Charge not found.');
-        }
-
-        $data = $this->request->getPost();
-        $newAmount = isset($data['amount']) ? (float)$data['amount'] : (float)$row['amount'];
-        $delta = $newAmount - (float)$row['amount'];
-
-        $db = \Config\Database::connect();
-        $db->transStart();
-
-        // Update the charge first
-        $this->additionalChargeModel->update($id, [
-            'title'       => trim($data['title'] ?? $row['title']),
-            'description' => trim($data['description'] ?? $row['description']),
-            'amount'      => $newAmount,
-            'due_date'    => $data['due_date'] ?? $row['due_date'],
-            'charge_type' => $data['charge_type'] ?? $row['charge_type'],
-            // keep status as-is
-        ]);
-
-        // If it’s already applied on an invoice and the amount changed, reflect the delta
-        if ($row['status'] === 'applied' && !empty($row['invoice_id']) && abs($delta) > 0.00001) {
-            if ($delta > 0) {
-                $this->invoiceModel->applyAdditionalCharge((int)$row['invoice_id'], $delta);
-            } else {
-                $this->invoiceModel->reverseAdditionalCharge((int)$row['invoice_id'], -$delta);
-            }
-        }
-
-        $db->transComplete();
-
-        if (!$db->transStatus()) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Failed to update charge', 'csrf_token' => csrf_token(), 'csrf_hash' => csrf_hash()]);
-            return redirect()->back()->with('error', 'Failed to update charge.');
-        }
-
-        if ($this->wantsJson()) return $this->response->setJSON(['ok' => true, 'id' => (int)$id, 'csrf_token' => csrf_token(), 'csrf_hash' => csrf_hash()]);
-        return redirect()->back()->with('status', 'Charge updated.');
-    }
-
-    // (removed duplicate model-like listAllForTerm method; use AdditionalChargeModel::listAllForTerm)
-
-    // ExtraChargesController.php
-    public function invoicesForParent()
-    {
-        $parentId   = (int)($this->request->getGet('parent_id') ?? 0);
-        $schoolYear = (string)($this->request->getGet('school_year') ?? $this->schoolYear);
-
-        $rows = ($parentId > 0)
-            ? ($this->invoiceModel->getInvoicesByUserId($parentId, $schoolYear) ?? [])
-            : [];
-
-        $results = array_map(function ($inv) {
-            $id       = (int)($inv['id'] ?? 0);
-            $num      = (string)($inv['invoice_number'] ?? ('INV-' . $id));
-            $status   = strtolower((string)($inv['status'] ?? ''));
-            $balance  = (float)($inv['balance'] ?? 0);
-            $issue    = $inv['issue_date'] ?? null;
-
-            return [
-                'id'             => $id,
-                'invoice_number' => $num,
-                'status'         => $status,
-                'balance'        => $balance,
-                'issue_date'     => $issue,
-                'text'           => $num
-                    . ($status ? ' — ' . ucfirst($status) : '')
-                    . ' (Bal: $' . number_format($balance, 2) . ')',
-            ];
-        }, $rows);
-
-        return $this->response->setJSON(['results' => $results]);
-    }
-
-
-    public function store()
-    {
-        $data = $this->request->getPost();
-
-        $rules = [
-            'parent_id'   => 'required|integer',  // this is actually the user_id of the parent
-            'title'       => 'required|string|min_length[2]',
-            'amount'      => 'required|decimal',
-            'charge_type' => 'required|in_list[add,deduct]',
-            'due_date'    => 'permit_empty|valid_date',
-            'invoice_id'  => 'permit_empty|integer',
-        ];
-        if (!$this->validate($rules)) {
-            $msg = implode(' ', $this->validator->getErrors());
-            if ($this->wantsJson()) {
-                return $this->response->setJSON([
-                    'ok' => false,
-                    'error' => $msg,
-                    'csrf_token' => csrf_token(),
-                    'csrf_hash' => csrf_hash(),
-                ]);
-            }
-            return redirect()->back()->withInput()->with('error', $msg);
-        }
-
-        $invoiceId  = !empty($data['invoice_id']) ? (int)$data['invoice_id'] : null;
-        $chargeType = (string)$data['charge_type'];
-
-        $amountAbs    = round(abs((float)$data['amount']), 2);
-        $signedAmount = ($chargeType === 'add') ? $amountAbs : -$amountAbs;
-
-        $payload = [
-            'parent_id'   => (int)$data['parent_id'], // ← users.id of the parent
-            'invoice_id'  => $invoiceId,
-            'school_year' => $data['school_year'] ?? $this->schoolYear,
-            'semester'    => $data['semester']    ?? $this->semester,
-            'charge_type' => $chargeType,
-            'title'       => trim($data['title']),
-            'description' => trim($data['description'] ?? ''),
-            'amount'      => $signedAmount,
-            'due_date'    => !empty($data['due_date']) ? $data['due_date'] : null,
-            'status'      => $invoiceId ? 'applied' : 'pending',
-            'created_by'  => (int)(session()->get('user_id') ?? 0),
-            'created_at'  => \CodeIgniter\I18n\Time::now('UTC')->toDateTimeString(), // store UTC
-        ];
-
-        $this->db->transStart();
-
-        // BEFORE
-        $invoiceBefore = $this->invoiceModel->getInvoicesByParentId($data['parent_id'], $this->schoolYear);
-
-        // Insert charge
-        $this->additionalChargeModel->insert($payload);
-        $chargeId = (int)$this->additionalChargeModel->getInsertID();
-
-        // Apply to invoice if present
-        if ($invoiceId) {
-            try {
-                if ($chargeType === 'add') {
-                    $this->invoiceModel->applyAdditionalCharge($invoiceId, $amountAbs);
-                } else {
-                    $this->invoiceModel->deductAdditionalCharge($invoiceId, $amountAbs);
-                }
-            } catch (\Throwable $e) {
-                log_message('error', 'apply/deductAdditionalCharge failed: ' . $e->getMessage());
-            }
-        }
-
-        // AFTER
-        $invoiceAfter = $this->invoiceModel->getInvoicesByParentId($data['parent_id'], $this->schoolYear);
-
-        // Parent USER (not parent table)
-        $parentUser = $this->userModel->getUserInfoById($data['parent_id']);
-
-        $this->db->transComplete();
-
-        if (!$this->db->transStatus()) {
-            $err = $this->db->error();
-            log_message('error', 'Transaction failed in ExtraChargesController::store: ' . json_encode($err));
-            if ($this->wantsJson()) {
-                return $this->response->setJSON(['ok' => false, 'error' => 'Failed to save charge', 'csrf_token' => csrf_token(), 'csrf_hash' => csrf_hash()]);
-            }
-            return redirect()->back()->withInput()->with('error', 'Failed to save charge.');
-        }
-
-        // Build event payload (same style as your payment handler)
-        // allow either first_name/last_name OR firstname/lastname from users table
-        $first = $parentUser['first_name'] ?? $parentUser['firstname'] ?? '';
-        $last  = $parentUser['last_name']  ?? $parentUser['lastname']  ?? '';
-        $parentName = trim($first . ' ' . $last);
-
-        $invoiceBefore = $this->normalizeRow($invoiceBefore);
-        $invoiceAfter  = $this->normalizeRow($invoiceAfter);
-
-        $invoiceTotal = $invoiceAfter ? (float)($invoiceAfter['total_amount'] ?? 0) : 0.0;
-        $preBalance   = $invoiceBefore ? (float)($invoiceBefore['balance'] ?? 0) : 0.0;
-        $postBalance  = $invoiceAfter  ? (float)($invoiceAfter['balance'] ?? 0)  : 0.0;
-
-        $eventData = [
-            // user identity (parent user)
-            'user_id'        => (int)($parentUser['id'] ?? 0),
-            'email'          => $parentUser['email'] ?? null,
-            'firstname'      => $first,
-            'lastname'       => $last,
-            'parentName'     => $parentName,
-
-            // context
-            'school_year'    => $payload['school_year'],
-            'semester'       => $payload['semester'],
-
-            // invoice
-            'invoice_id'     => $invoiceId,
-            'invoice_number' => $invoiceAfter['invoice_number'] ?? ($invoiceId ? 'INV-' . $invoiceId : null),
-
-            // charge details
-            'charge_id'      => $chargeId,
-            'charge_title'   => $payload['title'],
-            'charge_desc'    => $payload['description'],
-            'charge_type'    => $payload['charge_type'],     // add|deduct
-            'amount_signed'  => $signedAmount,
-            'amount_abs'     => $amountAbs,
-            'due_date'       => $payload['due_date'],
-            'created_at'     => $payload['created_at'],
-
-            // money snapshot
-            'pre_balance'    => $preBalance,
-            'post_balance'   => $postBalance,
-            'invoice_total'  => $invoiceTotal,
-
-            // links
-            'portal_link'    => base_url('/login'),
-            'invoice_link'   => $invoiceId ? site_url('parent/invoices/view/' . $invoiceId) : site_url('parent/invoices'),
-        ];
-
-        $students = []; // keep [] unless you want to include children under this user
-        Events::trigger('extraCharge', $eventData, $students);
-
-        if ($this->wantsJson()) {
-            return $this->response->setJSON([
-                'ok'          => true,
-                'id'          => $chargeId,
-                'invoice_id'  => $invoiceId,
-                'parent_id'   => (int)$data['parent_id'],
-                'csrf_token'  => csrf_token(),
-                'csrf_hash'   => csrf_hash(),
-            ]);
-        }
-        return redirect()->to(site_url('admin/charges'))->with('status', 'Charge recorded.');
-    }
-
-    /**
-     * Mark a charge as void and roll back its impact on the invoice if applied.
-     */
-    public function void($id)
-    {
-        $row = $this->additionalChargeModel->find((int)$id);
-        if (!$row) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Charge not found']);
-            return redirect()->back()->with('error', 'Charge not found.');
-        }
-
-        $invoiceId  = (int)($row['invoice_id'] ?? 0);
-        $amountAbs  = round(abs((float)($row['amount'] ?? 0)), 2);
-        $chargeType = (string)($row['charge_type'] ?? 'add');
-        $status     = (string)($row['status'] ?? 'pending');
-
-        $this->db->transStart();
-
-        if ($status === 'applied' && $invoiceId > 0 && $amountAbs > 0) {
-            try {
-                if ($chargeType === 'add') {
-                    $this->invoiceModel->reverseAdditionalCharge($invoiceId, $amountAbs);
-                } else {
-                    // voiding a deduction -> add back
-                    $this->invoiceModel->applyAdditionalCharge($invoiceId, $amountAbs);
-                }
-            } catch (\Throwable $e) {
-                log_message('error', 'void(): invoice adjust failed: ' . $e->getMessage());
-            }
-        }
-
-        $this->additionalChargeModel->update((int)$id, [
-            'status' => 'void',
-        ]);
-
-        $this->db->transComplete();
-
-        if (!$this->db->transStatus()) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Failed to void charge']);
-            return redirect()->back()->with('error', 'Failed to void charge.');
-        }
-
-        if ($this->wantsJson()) return $this->response->setJSON(['ok' => true]);
-        return redirect()->back()->with('status', 'Charge voided.');
-    }
-
-    /**
-     * Reverse a previously applied charge: undo invoice impact and return to pending state.
-     */
-    public function reverse($id)
-    {
-        $row = $this->additionalChargeModel->find((int)$id);
-        if (!$row) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Charge not found']);
-            return redirect()->back()->with('error', 'Charge not found.');
-        }
-
-        $invoiceId  = (int)($row['invoice_id'] ?? 0);
-        $amountAbs  = round(abs((float)($row['amount'] ?? 0)), 2);
-        $chargeType = (string)($row['charge_type'] ?? 'add');
-        $status     = (string)($row['status'] ?? 'pending');
-
-        if ($status !== 'applied' || $invoiceId <= 0 || $amountAbs <= 0) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Nothing to reverse']);
-            return redirect()->back()->with('error', 'Nothing to reverse.');
-        }
-
-        $this->db->transStart();
-        try {
-            if ($chargeType === 'add') {
-                $this->invoiceModel->reverseAdditionalCharge($invoiceId, $amountAbs);
-            } else {
-                $this->invoiceModel->applyAdditionalCharge($invoiceId, $amountAbs);
-            }
-        } catch (\Throwable $e) {
-            log_message('error', 'reverse(): invoice adjust failed: ' . $e->getMessage());
-        }
-
-        $this->additionalChargeModel->update((int)$id, [
-            'status'     => 'pending',
-            'invoice_id' => null,
-        ]);
-
-        $this->db->transComplete();
-
-        if (!$this->db->transStatus()) {
-            if ($this->wantsJson()) return $this->response->setJSON(['ok' => false, 'error' => 'Failed to reverse charge']);
-            return redirect()->back()->with('error', 'Failed to reverse charge.');
-        }
-
-        if ($this->wantsJson()) return $this->response->setJSON(['ok' => true]);
-        return redirect()->back()->with('status', 'Charge reversed to pending.');
-    }
-
-    /** JSON: list charges for the current term (with optional filters). */
-    public function apiList()
-    {
-        $year   = (string)($this->request->getGet('school_year') ?? $this->schoolYear);
-        $sem    = (string)($this->request->getGet('semester')    ?? $this->semester);
-        $status = $this->request->getGet('status') ?: null;
-        $q      = trim((string)($this->request->getGet('q') ?? '')) ?: null;
-        $per    = (int)($this->request->getGet('per_page') ?? 50);
-
-        $rows   = $this->additionalChargeModel->listAllForTerm($year, $sem, $status, $q, $per);
-        $pager  = $this->additionalChargeModel->pager;
-
-        $meta = [
-            'perPage'   => method_exists($pager, 'getPerPage') ? $pager->getPerPage() : $per,
-            'page'      => method_exists($pager, 'getCurrentPage') ? $pager->getCurrentPage() : null,
-            'total'     => method_exists($pager, 'getTotal') ? $pager->getTotal() : null,
-            'pageCount' => method_exists($pager, 'getPageCount') ? $pager->getPageCount() : null,
-        ];
-
-        return $this->response->setJSON([
-            'ok'          => true,
-            'school_year' => $year,
-            'semester'    => $sem,
-            'rows'        => $rows,
-            'pager'       => $meta,
-            'csrf_token'  => csrf_token(),
-            'csrf_hash'   => csrf_hash(),
-        ]);
-    }
-
-    // Normalize query result into a single associative row
-    private function normalizeRow($row): ?array
-    {
-        if (!$row) return null;
-        if (is_array($row) && isset($row[0]) && is_array($row[0])) {
-            return $row[0]; // unwrap first row from a result set
-        }
-        return is_array($row) ? $row : null;
-    }
-}
diff --git a/app/Http/Controllers/old/FeeCalculationService.php b/app/Http/Controllers/old/FeeCalculationService.php
new file mode 100644
index 00000000..f5540f32
--- /dev/null
+++ b/app/Http/Controllers/old/FeeCalculationService.php
@@ -0,0 +1,183 @@
+<?php
+namespace App\Services;
+
+use App\Models\ConfigurationModel;
+use App\Models\PaymentModel;
+use App\Models\InvoiceModel;
+use App\Models\ClassSectionModel;
+
+class FeeCalculationService
+{
+    public function calculateRefund(array $students, int $parentId): float
+    {
+        $configModel = new ConfigurationModel();
+        $paymentModel = new PaymentModel();
+        $invoiceModel = new InvoiceModel();
+        $classSectionModel = new ClassSectionModel();
+
+        $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')));
+        $totalPaid = $paymentModel->getTotalPaidByParentId($parentId, $schoolYear);
+
+        if ($totalPaid <= 0) {
+            log_message('info', "No payments made. Refund = 0.");
+            return 0;
+        }
+
+        // Classify and enrich student data
+        $registeredStudents = [];
+        $withdrawnStudents = [];
+
+        foreach ($students as &$student) {
+            $gradeName = $classSectionModel->getClassSectionNameBySectionId($student['class_section_id']);
+            $student['grade'] = strtoupper(trim($gradeName));
+
+            if (in_array($student['enrollment_status'], ['withdrawn', 'refund pending', 'withdraw under review'])) {
+                $withdrawnStudents[] = $student;
+            } elseif (
+                in_array($student['enrollment_status'], ['enrolled', 'payment pending']) &&
+                $student['admission_status'] === 'accepted'
+            ) {
+                $registeredStudents[] = $student;
+            }
+        }
+        unset($student);
+
+        if (empty($withdrawnStudents)) {
+            log_message('info', "No withdrawn students found. Refund = 0.");
+            return 0;
+        }
+
+        // Combine all students for proper fee tiering
+        $allStudents = array_merge($registeredStudents, $withdrawnStudents);
+
+        // Sort all students by grade for correct tiering
+        usort($allStudents, function ($a, $b) {
+            return $this->compareGrades($a['grade'], $b['grade']);
+        });
+
+        // Retrieve fee configs
+        $firstStudentFee = (float) ($configModel->getConfig('first_student_fee') ?? 350);
+        $secondStudentFee = (float) ($configModel->getConfig('second_student_fee') ?? 200);
+        $youthFee = (float) ($configModel->getConfig('youth_fee') ?? 180);
+
+        // Assign tuition_fee to all students (before filtering refunds)
+        $regularCount = 0;
+        foreach ($allStudents as &$student) {
+            $gradeLevel = $this->getGradeLevel($student['grade']);
+
+            if ($gradeLevel > 9) {
+                $studentFee = $youthFee;
+            } else {
+                $studentFee = ($regularCount === 0) ? $firstStudentFee : $secondStudentFee;
+                $regularCount++;
+            }
+        }
+        unset($student);
+
+        // Calculate refund for withdrawn students
+        $refundAmount = 0;
+
+        foreach ($withdrawnStudents as $student) {
+            if (empty($student['withdrawal_date'])) {
+                log_message('warning', "Missing withdraw date for student ID: {$student['student_id']}");
+                continue;
+            }
+
+            $withdrawDate = date('Y-m-d', strtotime($student['withdrawal_date']));
+            if (strtotime($withdrawDate) > strtotime($refundDeadline)) {
+                log_message('info', "Withdraw date {$withdrawDate} is after refund deadline {$refundDeadline}. No refund for this student.");
+                continue;
+            }
+
+            $withdrawDateObj = new \DateTime($withdrawDate);
+            $schoolEndDateObj = new \DateTime($schoolEndDate);
+            $daysRemaining = $withdrawDateObj->diff($schoolEndDateObj)->days;
+            $weeksRemaining = min($weekOfStudy, max(0, ceil($daysRemaining / 7)));
+
+            //$studentFee = $student['tuition_fee'];
+            $proportionalRefund = ($studentFee / $weekOfStudy) * $weeksRemaining;
+            $refundAmount += $proportionalRefund;
+
+            log_message('info', "Student ID {$student['student_id']} refund portion: {$proportionalRefund} of {$studentFee} for {$weeksRemaining} weeks.");
+        }
+
+        if ($refundAmount > $totalPaid) {
+            log_message('info', "Refund capped at total paid amount: {$totalPaid}");
+            return $totalPaid;
+        }
+
+        log_message('info', "Final calculated refund: {$refundAmount}");
+        return $refundAmount;
+    }
+
+
+    private function compareGrades($gradeA, $gradeB)
+    {
+        $valA = $this->getGradeLevel($gradeA);
+        $valB = $this->getGradeLevel($gradeB);
+
+        if ($valA !== $valB) return $valA <=> $valB;
+
+        // Same level, compare suffix
+        preg_match('/\d+([A-Z]*)$/i', strtoupper($gradeA), $suffixA);
+        preg_match('/\d+([A-Z]*)$/i', strtoupper($gradeB), $suffixB);
+
+        return strcmp($suffixA[1] ?? '', $suffixB[1] ?? '');
+    }
+
+    private function getGradeLevel($grade)
+    {
+        if (strtoupper($grade) === 'K') return 0;
+        if (strtoupper($grade) === 'Y') return 99;
+
+        if (preg_match('/^(\d+)([A-Z]*)$/i', $grade, $matches)) {
+            return (int) $matches[1];
+        }
+
+        return 999; // fallback for unknown/malformed grades
+    }
+
+
+    private function calculateTotalTuitionFee(array $students): float
+    {
+        $configModel = new ConfigurationModel();
+        $classSectionModel = new \App\Models\ClassSectionModel();
+
+        $firstStudentFee = (float) ($configModel->getConfig('first_student_fee') ?? 350);
+        $secondStudentFee = (float) ($configModel->getConfig('second_student_fee') ?? 200);
+        $youthFee = (float) ($configModel->getConfig('youth_fee') ?? 180);
+
+        // ✅ Pre-fetch and assign grade/class section names before sorting
+        foreach ($students as &$student) {
+            $gradeName = $classSectionModel->getClassSectionNameBySectionId($student['class_section_id']);
+            $student['grade'] = strtoupper(trim($gradeName));
+        }
+        unset($student); // break reference
+
+        // ✅ Sort students by grade
+        usort($students, function ($a, $b) {
+            return $this->compareGrades($a['grade'], $b['grade']);
+        });
+
+        $regularCount = 0;
+        $totalFee = 0;
+
+        // ✅ Calculate fee
+        foreach ($students as $student) {
+            $gradeLevel = $this->getGradeLevel($student['grade']);
+
+            if ($gradeLevel > 9) {
+                $totalFee += $youthFee;
+            } else {
+                $totalFee += ($regularCount === 0) ? $firstStudentFee : $secondStudentFee;
+                $regularCount++;
+            }
+        }
+
+        return $totalFee;
+    }
+
+}
diff --git a/app/Http/Controllers/old/FilesController.php b/app/Http/Controllers/old/FilesController.php
deleted file mode 100644
index 31a04946..00000000
--- a/app/Http/Controllers/old/FilesController.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use CodeIgniter\Controller;
-use CodeIgniter\Exceptions\PageNotFoundException;
-use Config\Database;
-
-class FilesController extends Controller
-{
-    public function receipt(string $name)
-    {
-        // 1) Path traversal guard
-        if ($name !== basename($name)) {
-            return $this->response->setStatusCode(400, 'Invalid filename');
-        }
-
-        // 2) Allow-list extensions (optional but safer)
-        $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-        $allowed = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'];
-        if (!in_array($ext, $allowed, true)) {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        // 3) Build path under writable
-        $path = WRITEPATH . 'uploads/receipts/' . $name;
-        if (!is_file($path)) {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        // 4) MIME detection (finfo is more reliable than mime_content_type)
-        $mime = 'application/octet-stream';
-        if (function_exists('finfo_open')) {
-            $fi = finfo_open(FILEINFO_MIME_TYPE);
-            if ($fi) {
-                $detected = finfo_file($fi, $path);
-                if ($detected) $mime = $detected;
-                finfo_close($fi);
-            }
-        }
-
-        // 5) Caching (ETag + Last-Modified) and 304 support
-        $mtime = filemtime($path) ?: time();
-        $etag  = md5($name . '|' . $mtime . '|' . filesize($path));
-
-        $ifNoneMatch     = $this->request->getHeaderLine('If-None-Match');
-        $ifModifiedSince = $this->request->getHeaderLine('If-Modified-Since');
-
-        if ($ifNoneMatch === $etag || (strtotime($ifModifiedSince) >= $mtime)) {
-            return $this->response
-                ->setStatusCode(304)
-                ->setHeader('ETag', $etag)
-                ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT');
-        }
-
-        // 6) Stream the file inline
-        return $this->response
-            ->setStatusCode(200)
-            ->setHeader('Content-Type', $mime)
-            ->setHeader('Content-Disposition', 'inline; filename="' . $name . '"')
-            ->setHeader('Content-Length', (string) filesize($path))
-            ->setHeader('ETag', $etag)
-            ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT')
-            ->setHeader('Cache-Control', 'public, max-age=86400')
-            ->setBody(file_get_contents($path));
-    }
-
-    public function reimb(string $name)
-    {
-        // 1) Path traversal guard
-        if ($name !== basename($name)) {
-            return $this->response->setStatusCode(400, 'Invalid filename');
-        }
-
-        // 2) Allow-list extensions
-        $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-        $allowed = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'];
-        if (!in_array($ext, $allowed, true)) {
-            throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
-        }
-
-        // 3) Build path under writable (REIMBURSEMENTS)
-        $path = WRITEPATH . 'uploads/reimbursements/' . $name;
-        if (!is_file($path)) {
-            throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
-        }
-
-        // 4) MIME detection (prefer finfo)
-        $mime = 'application/octet-stream';
-        if (function_exists('finfo_open')) {
-            $fi = finfo_open(FILEINFO_MIME_TYPE);
-            if ($fi) {
-                $detected = finfo_file($fi, $path);
-                if ($detected) {
-                    $mime = $detected;
-                }
-                finfo_close($fi);
-            }
-        } elseif (function_exists('mime_content_type')) {
-            $mime = mime_content_type($path) ?: $mime;
-        }
-
-        // 5) Caching (ETag + Last-Modified) and 304 support
-        $mtime = filemtime($path) ?: time();
-        $size  = filesize($path) ?: 0;
-        $etag  = md5($name . '|' . $mtime . '|' . $size);
-
-        $ifNoneMatch     = trim($this->request->getHeaderLine('If-None-Match'), '"');
-        $ifModifiedSince = $this->request->getHeaderLine('If-Modified-Since');
-        $imsTime         = $ifModifiedSince ? strtotime($ifModifiedSince) : false;
-
-        if (($ifNoneMatch && $ifNoneMatch === $etag) ||
-            ($imsTime !== false && $imsTime >= $mtime)
-        ) {
-            return $this->response
-                ->setStatusCode(304)
-                ->setHeader('ETag', $etag)
-                ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT');
-        }
-
-        // 6) Stream the file inline
-        return $this->response
-            ->setStatusCode(200)
-            ->setHeader('Content-Type', $mime)
-            ->setHeader('X-Content-Type-Options', 'nosniff')
-            ->setHeader('Content-Disposition', 'inline; filename="' . $name . '"')
-            ->setHeader('Content-Length', (string) $size)
-            ->setHeader('ETag', $etag)
-            ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT')
-            ->setHeader('Cache-Control', 'public, max-age=86400')
-            ->setBody(file_get_contents($path));
-    }
-
-    public function earlyDismissalSignature(string $name)
-    {
-        // 1) Path traversal guard
-        if ($name !== basename($name)) {
-            return $this->response->setStatusCode(400, 'Invalid filename');
-        }
-
-        // 2) Allow-list extensions
-        $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-        $allowed = ['jpg', 'jpeg', 'png', 'webp', 'gif', 'pdf'];
-        if (!in_array($ext, $allowed, true)) {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        // 3) Build path under writable (EARLY DISMISSAL SIGNATURES)
-        $path = WRITEPATH . 'uploads/early_dismissal_signatures/' . $name;
-        if (!is_file($path)) {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        // 4) MIME detection (prefer finfo)
-        $mime = 'application/octet-stream';
-        if (function_exists('finfo_open')) {
-            $fi = finfo_open(FILEINFO_MIME_TYPE);
-            if ($fi) {
-                $detected = finfo_file($fi, $path);
-                if ($detected) {
-                    $mime = $detected;
-                }
-                finfo_close($fi);
-            }
-        } elseif (function_exists('mime_content_type')) {
-            $mime = mime_content_type($path) ?: $mime;
-        }
-
-        // 5) Caching (ETag + Last-Modified) and 304 support
-        $mtime = filemtime($path) ?: time();
-        $size  = filesize($path) ?: 0;
-        $etag  = md5($name . '|' . $mtime . '|' . $size);
-
-        $ifNoneMatch     = trim($this->request->getHeaderLine('If-None-Match'), '"');
-        $ifModifiedSince = $this->request->getHeaderLine('If-Modified-Since');
-        $imsTime         = $ifModifiedSince ? strtotime($ifModifiedSince) : false;
-
-        if (($ifNoneMatch && $ifNoneMatch === $etag) ||
-            ($imsTime !== false && $imsTime >= $mtime)
-        ) {
-            return $this->response
-                ->setStatusCode(304)
-                ->setHeader('ETag', $etag)
-                ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT');
-        }
-
-        // 6) Stream the file inline
-        return $this->response
-            ->setStatusCode(200)
-            ->setHeader('Content-Type', $mime)
-            ->setHeader('X-Content-Type-Options', 'nosniff')
-            ->setHeader('Content-Disposition', 'inline; filename="' . $name . '"')
-            ->setHeader('Content-Length', (string) $size)
-            ->setHeader('ETag', $etag)
-            ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT')
-            ->setHeader('Cache-Control', 'public, max-age=86400')
-            ->setBody(file_get_contents($path));
-    }
-
-    public function examDraftTeacher(string $name)
-    {
-        return $this->serveExamDraftFile($name, 'drafts');
-    }
-
-    public function examDraftFinal(string $name)
-    {
-        return $this->serveExamDraftFile($name, 'finals');
-    }
-
-    private function serveExamDraftFile(string $name, string $subdir)
-    {
-        if ($name !== basename($name)) {
-            return $this->response->setStatusCode(400, 'Invalid filename');
-        }
-
-        $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
-        $allowed = ['doc', 'docx', 'pdf'];
-        if (!in_array($ext, $allowed, true)) {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        $path = WRITEPATH . 'uploads/exams/' . trim($subdir, '/') . '/' . $name;
-        if (!is_file($path)) {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        $mime = 'application/octet-stream';
-        if (function_exists('finfo_open')) {
-            $fi = finfo_open(FILEINFO_MIME_TYPE);
-            if ($fi) {
-                $detected = finfo_file($fi, $path);
-                if ($detected) {
-                    $mime = $detected;
-                }
-                finfo_close($fi);
-            }
-        } elseif (function_exists('mime_content_type')) {
-            $mime = mime_content_type($path) ?: $mime;
-        }
-
-        $mtime = filemtime($path) ?: time();
-        $size  = filesize($path) ?: 0;
-        $etag  = md5($name . '|' . $mtime . '|' . $size);
-
-        $ifNoneMatch     = trim($this->request->getHeaderLine('If-None-Match'), '"');
-        $ifModifiedSince = $this->request->getHeaderLine('If-Modified-Since');
-        $imsTime         = $ifModifiedSince ? strtotime($ifModifiedSince) : false;
-
-        if (($ifNoneMatch && $ifNoneMatch === $etag) ||
-            ($imsTime !== false && $imsTime >= $mtime)
-        ) {
-            return $this->response
-                ->setStatusCode(304)
-                ->setHeader('ETag', $etag)
-                ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT');
-        }
-
-        $downloadName = $this->buildDraftDownloadName($name, $subdir);
-
-        return $this->response
-            ->setStatusCode(200)
-            ->setHeader('Content-Type', $mime)
-            ->setHeader('X-Content-Type-Options', 'nosniff')
-            ->setHeader('Content-Disposition', 'inline; filename="' . $downloadName . '.' . $ext . '"')
-            ->setHeader('Content-Length', (string) $size)
-            ->setHeader('ETag', $etag)
-            ->setHeader('Last-Modified', gmdate('D, d M Y H:i:s', $mtime) . ' GMT')
-            ->setHeader('Cache-Control', 'public, max-age=86400')
-            ->setBody(file_get_contents($path));
-    }
-
-    private function buildDraftDownloadName(string $filename, string $subdir): string
-    {
-        $column = $subdir === 'finals' ? 'final_file' : 'teacher_file';
-        $db = Database::connect();
-        $row = $db->table('exam_drafts ed')
-            ->select('ed.version, ed.exam_type, ed.class_section_id, cs.class_section_name')
-            ->join('classSection cs', 'cs.class_section_id = ed.class_section_id', 'left')
-            ->where('ed.' . $column, $filename)
-            ->limit(1)
-            ->get()
-            ->getRowArray();
-
-        $classLabel = trim((string) ($row['class_section_name'] ?? 'Class' . ($row['class_section_id'] ?? '0')));
-        $typeLabel = trim((string) ($row['exam_type'] ?? 'Exam'));
-        $version = 'v' . max(1, (int) ($row['version'] ?? 1));
-
-        $parts = array_filter([
-            $this->slugify($classLabel),
-            $this->slugify($typeLabel),
-            $version,
-        ]);
-
-        return implode('_', $parts);
-    }
-
-    private function slugify(string $value): string
-    {
-        $value = trim($value);
-        $value = preg_replace('/[^\p{L}\p{N}]+/u', '_', $value);
-        $value = trim($value, '_');
-        return $value === '' ? 'Exam' : mb_strtolower($value);
-    }
-}
diff --git a/app/Http/Controllers/old/FinalController.php b/app/Http/Controllers/old/FinalController.php
deleted file mode 100644
index c028396a..00000000
--- a/app/Http/Controllers/old/FinalController.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\StudentModel;
-use App\Models\ConfigurationModel;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-class FinalController extends BaseController
-{
-    protected $db;
-    protected $schoolYear;
-    protected $semester;
-    protected $configModel;
-    protected $studentModel;
-    protected $teacherClassModel;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-        $this->configModel = new ConfigurationModel();
-        $this->studentModel = new StudentModel();
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-    }
-
-    public function add()
-    {
-        // Accept class_section_id from POST/GET with session fallback
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-
-        // Persist for downstream calls
-        session()->set('class_section_id', $classSectionId);
-
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->schoolYear;
-        try {
-            $result = $this->getSavedScores($classSectionId, $semester, $schoolYear);
-            $missingOkMap = $this->missingScoreOverrideModel->getOverridesMap($classSectionId, $semester, $schoolYear, 'final_exam');
-
-            return view('teacher/add_final_exam', [
-                'students'       => $result['students'],
-                'semester'       => $result['semester'],
-                'schoolYear'     => $result['schoolYear'],
-                'classSectionId' => $classSectionId,
-                'missingOkMap'   => $missingOkMap,
-            ]);
-        } catch (\Throwable $e) {
-            return redirect()->back()->with('status', $e->getMessage());
-        }
-    }
-
-    public function showFinalMngt()
-    {
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->schoolYear;
-        try {
-            $result = $this->getSavedScores($classSectionId, $semester, $schoolYear);
-            $scoresLocked = $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-
-            return view('grading/final', [
-                'students'       => $result['students'],
-                'semester'       => $result['semester'],
-                'schoolYear'     => $result['schoolYear'],
-                'classSectionId' => $classSectionId,
-                'scoresLocked'   => $scoresLocked,
-            ]);
-        } catch (\Throwable $e) {
-            return redirect()->back()->with('status', $e->getMessage());
-        }
-    }
-
-    private function getSavedScores(int $classSectionId, string $semester, string $schoolYear): array
-    {
-        if ($classSectionId <= 0) {
-            throw new \InvalidArgumentException('Invalid class section id.');
-        }
-
-        session()->set('class_section_id', $classSectionId);
-
-        // Subquery: pick ONE final exam row per student (latest by id)
-        $latestFinalSub = $this->db->table('final_exam')
-            ->select('student_id, MAX(id) AS max_id')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->groupBy('student_id')
-            ->getCompiledSelect();
-
-        // Main query: roster + LEFT JOIN the single final exam row
-        $qb = $this->studentModel
-            ->select('
-            s.id AS student_id,
-            s.school_id,
-            s.firstname,
-            s.lastname,
-            fe.score
-        ')
-            ->from('students s')
-            ->join(
-                'student_class sc',
-                'sc.student_id = s.id
-             AND sc.class_section_id = ' . (int) $classSectionId . '
-             AND sc.school_year = ' . $this->db->escape($schoolYear),
-                'inner',
-                false
-            )
-            ->join('(' . $latestFinalSub . ') fl', 'fl.student_id = s.id', 'left', false)
-            ->join('final_exam fe', 'fe.id = fl.max_id', 'left')
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC');
-
-        $qb->distinct();
-        $rows = $qb->get()->getResultArray();
-
-        // Ensure one row per student
-        $unique = [];
-        foreach ($rows as $r) {
-            $unique[(int)$r['student_id']] = $r;
-        }
-        $students = array_values($unique);
-
-        return [
-            'students'   => $students,
-            'semester'   => $semester,
-            'schoolYear' => $schoolYear,
-        ];
-    }
-
-    private function getTeacherSelectedSemester(): string
-    {
-        helper('semester_selection_helper');
-        return selected_teacher_semester();
-    }
-}
diff --git a/app/Http/Controllers/old/FinancialController.php b/app/Http/Controllers/old/FinancialController.php
deleted file mode 100644
index 8b2323cc..00000000
--- a/app/Http/Controllers/old/FinancialController.php
+++ /dev/null
@@ -1,1349 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use App\Models\DiscountUsageModel;
-use App\Models\InvoiceModel;
-use App\Models\PaymentModel;
-use App\Models\RefundModel;
-use App\Models\ExpenseModel;
-use App\Models\ReimbursementModel;
-use App\Models\UserModel;
-
-require_once APPPATH . 'ThirdParty/fpdf/fpdf.php';
-use FPDF;
-
-class FinancialController extends BaseController
-{   
-    private function wantsJson(): bool
-    {
-        $accept = strtolower((string)($this->request->getHeaderLine('Accept') ?? ''));
-        return $this->request->isAJAX() || str_contains($accept, 'application/json');
-    }
-    
-public function financialReport()
-{
-    $invoiceModel        = new InvoiceModel();
-    $paymentModel        = new PaymentModel();
-    $refundModel         = new RefundModel();
-    $expenseModel        = new ExpenseModel();
-    $reimbursementModel  = new ReimbursementModel();
-    $discountModel       = new DiscountUsageModel();
-
-    $dateFrom   = $this->request->getGet('date_from');
-    $dateTo     = $this->request->getGet('date_to');
-    $schoolYear = $this->request->getGet('school_year');
-
-    // === Apply filters to models (invoice/refund/discount/expense/reimb) ===
-    if ($schoolYear) {
-        $invoiceModel->where('invoices.school_year', $schoolYear);
-        $refundModel->where('school_year', $schoolYear);
-        $discountModel->where('school_year', $schoolYear);
-        // If these tables have school_year columns:
-        $expenseModel->where('school_year', $schoolYear);
-        $reimbursementModel->where('school_year', $schoolYear);
-        // Payments are filtered separately below to ensure reuse across queries
-    }
-
-    // Apply date filters (support from-only and to-only) using domain-appropriate fields
-    $hasFrom = !empty($dateFrom);
-    $hasTo   = !empty($dateTo);
-    if ($hasFrom) {
-        // Invoices: prefer issue_date, fallback to created_at
-        $invoiceModel->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) >=', $dateFrom);
-        // Refunds: prefer refunded_at, fallback to created_at
-        $refundModel->where('DATE(COALESCE(refunded_at, created_at)) >=', $dateFrom);
-        // Discounts: prefer used_at, fallback to created_at
-        $discountModel->where('DATE(COALESCE(used_at, created_at)) >=', $dateFrom);
-        // Expenses & Reimbursements: created_at
-        $expenseModel->where('DATE(created_at) >=', $dateFrom);
-        $reimbursementModel->where('DATE(created_at) >=', $dateFrom);
-    }
-    if ($hasTo) {
-        $invoiceModel->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) <=', $dateTo);
-        $refundModel->where('DATE(COALESCE(refunded_at, created_at)) <=', $dateTo);
-        $discountModel->where('DATE(COALESCE(used_at, created_at)) <=', $dateTo);
-        $expenseModel->where('DATE(created_at) <=', $dateTo);
-        $reimbursementModel->where('DATE(created_at) <=', $dateTo);
-    }
-
-    // === Invoices ===
-    $invoices = $invoiceModel
-        ->select("invoices.*, CONCAT(users.firstname, ' ', users.lastname) AS parent_name")
-        ->join('users', 'users.id = invoices.parent_id')
-        ->findAll();
-
-    // Helper to build a fresh, filtered PaymentModel each time (so filters don't get lost between queries)
-    $buildPaymentModel = function () use ($schoolYear, $dateFrom, $dateTo) {
-        $pm = new PaymentModel();
-        if ($schoolYear) {
-            $pm->where('school_year', $schoolYear);
-        }
-        if (!empty($dateFrom)) {
-            $pm->where('DATE(payment_date) >=', $dateFrom);
-        }
-        if (!empty($dateTo)) {
-            $pm->where('DATE(payment_date) <=', $dateTo);
-        }
-        return $pm;
-    };
-    // Filter out void/failed/chargeback/etc. payments (align with balance logic elsewhere)
-    $applyPaymentFilters = function ($qb) {
-        try {
-            $db = \Config\Database::connect();
-            $hasStatus = $db->fieldExists('status', 'payments');
-            $hasVoid   = $db->fieldExists('is_void', 'payments');
-            $exclude   = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-
-            if ($hasStatus) {
-                $qb->groupStart()
-                    ->whereNotIn('status', $exclude)
-                    ->orWhere('status IS NULL', null, false)
-                    ->groupEnd();
-            }
-            if ($hasVoid) {
-                $qb->groupStart()
-                    ->where('is_void', 0)
-                    ->orWhere('is_void IS NULL', null, false)
-                    ->groupEnd();
-            }
-        } catch (\Throwable $e) {
-            // If schema checks fail, fall back to unfiltered results.
-        }
-        return $qb;
-    };
-
-    // === Payments aggregated by invoice_id (for the "Paid" column) ===
-    $payments = $applyPaymentFilters($buildPaymentModel())
-        ->select('invoice_id, SUM(paid_amount) AS paid_amount')
-        ->where('invoice_id IS NOT NULL')
-        ->groupBy('invoice_id')
-        ->findAll();
-
-    // === Per-invoice breakdown by normalized method (cash/credit/check) ===
-    // Normalization rules:
-    //  - 'cash' => 'cash'
-    //  - 'check','cheque' => 'check'
-    //  - 'credit','card','credit card','debit','debit card','visa','mastercard' => 'credit'
-    //  - everything else => 'other' (not shown per-invoice, still included in grand totals)
-    $paymentBreakdownRows = $applyPaymentFilters($buildPaymentModel())
-        ->select("
-            invoice_id,
-            CASE
-                WHEN LOWER(TRIM(payment_method)) = 'cash' THEN 'cash'
-                WHEN LOWER(TRIM(payment_method)) IN ('check','cheque') THEN 'check'
-                WHEN LOWER(TRIM(payment_method)) IN ('credit','card','credit card','debit','debit card','visa','mastercard') THEN 'credit'
-                ELSE 'other'
-            END AS method,
-            SUM(paid_amount) AS amount
-        ")
-        ->where('invoice_id IS NOT NULL')
-        ->groupBy('invoice_id, method')
-        ->findAll();
-
-    // Map to [invoice_id => ['cash' => x, 'credit' => y, 'check' => z, 'other' => o]]
-    $paymentBreakdown = [];
-    foreach ($paymentBreakdownRows as $row) {
-        $iid = (int)($row['invoice_id'] ?? 0);
-        if ($iid <= 0) continue;
-        $method = (string)$row['method'];
-        $amount = (float)$row['amount'];
-        if (!isset($paymentBreakdown[$iid])) $paymentBreakdown[$iid] = [];
-        $paymentBreakdown[$iid][$method] = $amount;
-    }
-
-    // === Overall totals by method + grand total ===
-    $paymentTotalsRow = $applyPaymentFilters($buildPaymentModel())
-        ->select("
-            SUM(paid_amount) AS total_all,
-            SUM(CASE WHEN LOWER(TRIM(payment_method)) = 'cash' THEN paid_amount ELSE 0 END) AS total_cash,
-            SUM(CASE WHEN LOWER(TRIM(payment_method)) IN ('check','cheque') THEN paid_amount ELSE 0 END) AS total_check,
-            SUM(CASE WHEN LOWER(TRIM(payment_method)) IN ('credit','card','credit card','debit','debit card','visa','mastercard') THEN paid_amount ELSE 0 END) AS total_credit
-        ")
-        ->where('invoice_id IS NOT NULL')
-        ->first() ?? [];
-
-    $paymentTotals = [
-        'total_all'    => (float)($paymentTotalsRow['total_all']    ?? 0),
-        'total_cash'   => (float)($paymentTotalsRow['total_cash']   ?? 0),
-        'total_check'  => (float)($paymentTotalsRow['total_check']  ?? 0),
-        'total_credit' => (float)($paymentTotalsRow['total_credit'] ?? 0),
-    ];
-
-    // === Refunds (grouped) ===
-    $refunds = $refundModel
-        ->select('invoice_id, school_year, SUM(refund_paid_amount) AS total_refunded')
-        ->where('invoice_id IS NOT NULL')
-        ->whereIn('status', ['Partial', 'Paid'])
-        ->groupBy(['invoice_id', 'school_year'])
-        ->findAll();
-
-    // === Discounts (grouped) ===
-    $discounts = $discountModel
-        ->select('invoice_id, school_year, SUM(discount_amount) AS discount_amount')
-        ->where('invoice_id IS NOT NULL')
-        ->groupBy(['invoice_id', 'school_year'])
-        ->get()
-        ->getResultArray();
-
-    // === Expenses ===
-    $expenses = $expenseModel
-        ->select('category, SUM(amount) AS total_amount')
-        ->groupBy('category')
-        ->findAll();
-
-    // === Reimbursements ===
-    $reimbursements = $reimbursementModel
-        ->select('status, SUM(amount) AS total_amount')
-        ->groupBy('status')
-        ->findAll();
-
-    // --- School year options (for detailed view & JSON) ---
-    $schoolYears = [];
-    try {
-        $db = \Config\Database::connect();
-        $rows = $db->table('invoices')
-            ->select('DISTINCT school_year', false)
-            ->where('school_year IS NOT NULL', null, false)
-            ->orderBy('school_year', 'DESC')
-            ->get()->getResultArray();
-        foreach ($rows as $r) {
-            $val = (string)($r['school_year'] ?? '');
-            if ($val !== '' && !in_array($val, $schoolYears, true)) $schoolYears[] = $val;
-        }
-    } catch (\Throwable $e) {}
-    if (empty($schoolYears) && !empty($schoolYear)) {
-        $schoolYears[] = (string)$schoolYear;
-    }
-    
-    // JSON API support
-    if ($this->wantsJson() || strtolower((string)($this->request->getGet('format') ?? '')) === 'json') {
-        return $this->response->setJSON([
-            'ok'               => true,
-            'selectedYear'     => $schoolYear,
-            'dateFrom'         => $dateFrom,
-            'dateTo'           => $dateTo,
-            'schoolYears'      => $schoolYears,
-            'invoices'         => $invoices,
-            'payments'         => $payments,
-            'paymentBreakdown' => $paymentBreakdown,
-            'paymentTotals'    => $paymentTotals,
-            'refunds'          => $refunds,
-            'expenses'         => $expenses,
-            'reimbursements'   => $reimbursements,
-            'discounts'        => $discounts,
-            'csrf_token'       => csrf_token(),
-            'csrf_hash'        => csrf_hash(),
-        ]);
-    }
-
-    return view('payment/financial_report', [
-        'invoices'         => $invoices,
-        'payments'         => $payments,           // for Paid column
-        'paymentBreakdown' => $paymentBreakdown,   // per-invoice Cash/Credit/Check
-        'paymentTotals'    => $paymentTotals,      // summary totals + grand total
-        'refunds'          => $refunds,
-        'expenses'         => $expenses,
-        'reimbursements'   => $reimbursements,
-        'discounts'        => $discounts,
-        'selectedYear'     => $schoolYear,
-        'schoolYears'      => $schoolYears,
-        'dateFrom'         => $dateFrom,
-        'dateTo'           => $dateTo,
-    ]);
-}
-
-
-    public function financialReportSummary()
-    {
-        $dateFrom   = $this->request->getGet('date_from');
-        $dateTo     = $this->request->getGet('date_to');
-        $schoolYear = $this->request->getGet('school_year');
-
-        $data = $this->getFinancialSummary($dateFrom, $dateTo, $schoolYear);
-
-        // Build school year options from invoices table (fallback to configured year)
-        $schoolYears = [];
-        try {
-            $db = \Config\Database::connect();
-            $rows = $db->table('invoices')
-                ->select('DISTINCT school_year', false)
-                ->where('school_year IS NOT NULL', null, false)
-                ->orderBy('school_year', 'DESC')
-                ->get()->getResultArray();
-            foreach ($rows as $r) {
-                $val = (string)($r['school_year'] ?? '');
-                if ($val !== '' && !in_array($val, $schoolYears, true)) $schoolYears[] = $val;
-            }
-        } catch (\Throwable $e) {}
-        if (empty($schoolYears) && !empty($data['schoolYear'])) {
-            $schoolYears[] = (string)$data['schoolYear'];
-        }
-        $data['schoolYears'] = $schoolYears;
-        if ($this->wantsJson() || strtolower((string)($this->request->getGet('format') ?? '')) === 'json') {
-            return $this->response->setJSON(['ok' => true] + $data + [
-                'csrf_token' => csrf_token(),
-                'csrf_hash'  => csrf_hash(),
-            ]);
-        }
-        return view('payment/financial_report_summary', $data);
-    }
-
-    public function financialReportData()
-    {
-        $this->response->setHeader('Accept', 'application/json');
-        return $this->financialReport();
-    }
-
-    public function financialReportSummaryData()
-    {
-        $this->response->setHeader('Accept', 'application/json');
-        return $this->financialReportSummary();
-    }
-
-        public function downloadCsv()
-        {
-
-            $invoiceModel       = new InvoiceModel();
-            $refundModel        = new RefundModel();
-            $discountModel      = new DiscountUsageModel();
-            $expenseModel       = new ExpenseModel();
-            $reimbursementModel = new ReimbursementModel();
-
-        $dateFrom   = $this->request->getGet('date_from');
-        $dateTo     = $this->request->getGet('date_to');
-        $schoolYear = $this->request->getGet('school_year');
-
-        // Invoices with filters (school year + date range on issue_date/created_at)
-        $invBuilder = $invoiceModel
-            ->select("invoices.*, CONCAT(users.firstname, ' ', users.lastname) AS parent_name")
-            ->join('users', 'users.id = invoices.parent_id');
-        if (!empty($schoolYear)) {
-            $invBuilder->where('invoices.school_year', $schoolYear);
-        }
-        if (!empty($dateFrom)) {
-            $invBuilder->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) >=', $dateFrom);
-        }
-        if (!empty($dateTo)) {
-            $invBuilder->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) <=', $dateTo);
-        }
-        $invoices = $invBuilder->findAll();
-
-        $hasFrom = !empty($dateFrom);
-        $hasTo   = !empty($dateTo);
-
-        $buildPaymentModel = function () use ($schoolYear, $dateFrom, $dateTo) {
-            $pm = new PaymentModel();
-            if ($schoolYear) {
-                $pm->where('school_year', $schoolYear);
-            }
-            if (!empty($dateFrom)) {
-                $pm->where('DATE(payment_date) >=', $dateFrom);
-            }
-            if (!empty($dateTo)) {
-                $pm->where('DATE(payment_date) <=', $dateTo);
-            }
-            return $pm;
-        };
-        $applyPaymentFilters = function ($qb) {
-            try {
-                $db = \Config\Database::connect();
-                $hasStatus = $db->fieldExists('status', 'payments');
-                $hasVoid   = $db->fieldExists('is_void', 'payments');
-                $exclude   = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-                if ($hasStatus) {
-                    $qb->groupStart()
-                        ->whereNotIn('status', $exclude)
-                        ->orWhere('status IS NULL', null, false)
-                        ->groupEnd();
-                }
-                if ($hasVoid) {
-                    $qb->groupStart()
-                        ->where('is_void', 0)
-                        ->orWhere('is_void IS NULL', null, false)
-                        ->groupEnd();
-                }
-            } catch (\Throwable $e) {
-            }
-            return $qb;
-        };
-
-        $payments = $applyPaymentFilters($buildPaymentModel())
-            ->select('invoice_id, SUM(paid_amount) AS paid_amount')
-            ->where('invoice_id IS NOT NULL')
-            ->groupBy('invoice_id')
-            ->findAll();
-
-        $paymentsMap = [];
-        foreach ($payments as $payment) {
-            $paymentsMap[(int)($payment['invoice_id'] ?? 0)] = (float)($payment['paid_amount'] ?? 0);
-        }
-
-        $paymentBreakdownRows = $applyPaymentFilters($buildPaymentModel())
-            ->select("
-                invoice_id,
-                CASE
-                    WHEN LOWER(TRIM(payment_method)) = 'cash' THEN 'cash'
-                    WHEN LOWER(TRIM(payment_method)) IN ('check','cheque') THEN 'check'
-                    WHEN LOWER(TRIM(payment_method)) IN ('credit','card','credit card','debit','debit card','visa','mastercard') THEN 'credit'
-                    ELSE 'other'
-                END AS method,
-                SUM(paid_amount) AS amount
-            ")
-            ->where('invoice_id IS NOT NULL')
-            ->groupBy('invoice_id, method')
-            ->findAll();
-
-        $paymentBreakdown = [];
-        foreach ($paymentBreakdownRows as $row) {
-            $iid = (int)($row['invoice_id'] ?? 0);
-            if ($iid <= 0) continue;
-            $method = (string)$row['method'];
-            $amount = (float)($row['amount'] ?? 0);
-            if (!isset($paymentBreakdown[$iid])) $paymentBreakdown[$iid] = [];
-            $paymentBreakdown[$iid][$method] = $amount;
-        }
-
-        // Expenses summary with filters
-        $expBuilder = $expenseModel
-            ->select('category, SUM(amount) AS total_amount');
-        if (!empty($schoolYear)) {
-            $expBuilder->where('school_year', $schoolYear);
-        }
-        if (!empty($dateFrom)) {
-            $expBuilder->where('DATE(created_at) >=', $dateFrom);
-        }
-        if (!empty($dateTo)) {
-            $expBuilder->where('DATE(created_at) <=', $dateTo);
-        }
-        $expenses = $expBuilder->groupBy('category')->findAll();
-
-        // Reimbursements summary with filters
-        $reimbBuilder = $reimbursementModel
-            ->select('status, SUM(amount) AS total_amount');
-        if (!empty($schoolYear)) {
-            $reimbBuilder->where('school_year', $schoolYear);
-        }
-        if (!empty($dateFrom)) {
-            $reimbBuilder->where('DATE(created_at) >=', $dateFrom);
-        }
-        if (!empty($dateTo)) {
-            $reimbBuilder->where('DATE(created_at) <=', $dateTo);
-        }
-        $reimbursements = $reimbBuilder->groupBy('status')->findAll();
-
-        // Refunds (grouped)
-        if (!empty($schoolYear)) {
-            $refundModel->where('school_year', $schoolYear);
-        }
-        if ($hasFrom) {
-            $refundModel->where('DATE(COALESCE(refunded_at, created_at)) >=', $dateFrom);
-        }
-        if ($hasTo) {
-            $refundModel->where('DATE(COALESCE(refunded_at, created_at)) <=', $dateTo);
-        }
-        $refundsData = $refundModel
-            ->select('invoice_id, SUM(refund_paid_amount) AS total_refunded')
-            ->where('invoice_id IS NOT NULL')
-            ->whereIn('status', ['Partial', 'Paid'])
-            ->groupBy('invoice_id')
-            ->findAll();
-        $refunds = [];
-        foreach ($refundsData as $refund) {
-            $refunds[$refund['invoice_id']] = $refund['total_refunded'];
-        }
-
-        $discountBuilder = $discountModel;
-        if (!empty($schoolYear)) {
-            $discountBuilder->where('school_year', $schoolYear);
-        }
-        if ($hasFrom) {
-            $discountBuilder->where('DATE(COALESCE(used_at, created_at)) >=', $dateFrom);
-        }
-        if ($hasTo) {
-            $discountBuilder->where('DATE(COALESCE(used_at, created_at)) <=', $dateTo);
-        }
-        $discountsData = $discountBuilder
-            ->select('invoice_id, SUM(discount_amount) AS discount_amount')
-            ->where('invoice_id IS NOT NULL')
-            ->groupBy('invoice_id')
-            ->get()
-            ->getResultArray();
-
-        $discounts = [];
-        foreach ($discountsData as $disc) {
-            $discounts[$disc['invoice_id']] = $disc['discount_amount'];
-        }
-
-        $filename = 'financial_report_' . date('Ymd_His') . '.csv';
-
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
-
-        $out = fopen('php://output', 'w');
-
-        // Invoices section
-        fputcsv($out, ['Invoice #', 'Parent', 'School Year', 'Total', 'Paid', 'Cash', 'Credit', 'Check', 'Balance', 'Refund', 'Discount', 'Status']);
-        $sumTotal = 0.0;
-        $sumPaid = 0.0;
-        $sumCash = 0.0;
-        $sumCredit = 0.0;
-        $sumCheck = 0.0;
-        $sumBalance = 0.0;
-        $sumRefund = 0.0;
-        $sumDiscount = 0.0;
-        foreach ($invoices as $inv) {
-            $invoiceId = (int)($inv['id'] ?? 0);
-            $paid      = (float)($paymentsMap[$invoiceId] ?? 0);
-            $bd        = $paymentBreakdown[$invoiceId] ?? [];
-            $cash      = (float)($bd['cash']   ?? 0);
-            $credit    = (float)($bd['credit'] ?? 0);
-            $check     = (float)($bd['check']  ?? 0);
-            $refunded  = (float)($refunds[$invoiceId] ?? 0);
-            $discount  = (float)($discounts[$invoiceId] ?? 0);
-            $total     = (float)($inv['total_amount'] ?? 0);
-            $balance   = $total - $paid - $discount - $refunded;
-            if ($balance < 0) $balance = 0.0;
-            $status    = ($balance === 0.0) ? 'Paid' : 'Unpaid';
-
-            fputcsv($out, [
-                $inv['invoice_number'],
-                $inv['parent_name'] ?? '',
-                $inv['school_year'],
-                $total,
-                $paid,
-                $cash,
-                $credit,
-                $check,
-                $balance,
-                $refunded,
-                $discount,
-                $status,
-            ]);
-
-            $sumTotal += $total;
-            $sumPaid += $paid;
-            $sumCash += $cash;
-            $sumCredit += $credit;
-            $sumCheck += $check;
-            $sumBalance += $balance;
-            $sumRefund += $refunded;
-            $sumDiscount += $discount;
-        }
-        fputcsv($out, [
-            'TOTALS',
-            '',
-            '',
-            $sumTotal,
-            $sumPaid,
-            $sumCash,
-            $sumCredit,
-            $sumCheck,
-            $sumBalance,
-            $sumRefund,
-            $sumDiscount,
-            '',
-        ]);
-
-        // Expenses section
-        fputcsv($out, []); // blank line
-        fputcsv($out, ['Expenses Summary']);
-        fputcsv($out, ['Category', 'Total Amount']);
-        foreach ($expenses as $exp) {
-            fputcsv($out, [
-                $exp['category'],
-                $exp['total_amount']
-            ]);
-        }
-
-        // Reimbursements section
-        fputcsv($out, []); // blank line
-        fputcsv($out, ['Reimbursements Summary']);
-        fputcsv($out, ['Status', 'Total Amount']);
-        foreach ($reimbursements as $r) {
-            fputcsv($out, [
-                $r['status'],
-                $r['total_amount']
-            ]);
-        }
-
-        fclose($out);
-        exit;
-    }
-
-    public function downloadFinancialReport()
-    {
-        helper('filesystem');
-
-        $dateFrom   = $this->request->getGet('date_from');
-        $dateTo     = $this->request->getGet('date_to');
-        $schoolYear = $this->request->getGet('school_year');
-        $data = $this->getFinancialSummary($dateFrom, $dateTo, $schoolYear);
-
-        // === Generate charts ===
-        $this->generateBarChart($data);
-        $this->generatePieChart($data);
-
-        $pdf = new \FPDF();
-        $pdf->AddPage();
-        $pdf->SetFont('Arial', 'B', 16);
-        $pdf->Cell(0, 10, 'Financial Report for School Year: ' . $data['schoolYear'], 0, 1, 'C');
-
-        $pdf->Ln(10);
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell(130, 10, 'Description', 1);
-        $pdf->Cell(60, 10, 'Amount (USD)', 1);
-        $pdf->Ln();
-
-        $rows = [
-            'Total Charges' => $data['totalCharges'],
-            'Total Extra Charges' => $data['totalExtraCharges'] ?? 0,
-            'Total Discounts' => $data['totalDiscounts'],
-            'Total Refunds' => $data['totalRefunds'],
-            'Total Expenses' => $data['totalExpenses'],
-            'Total Reimbursements' => $data['totalReimbursements'],
-            'Donation to School (Masjid/Donation reimbursements)' => $data['donationToSchool'] ?? 0,
-            'Net Amount (Earned Income)' => $data['netAmount'],
-            'Amount Collected (Paid)' => $data['amountCollected'],
-            'Amount Unpaid (Outstanding)' => $data['totalUnpaid'],
-        ];
-
-        $pdf->SetFont('Arial', '', 11);
-        foreach ($rows as $label => $amount) {
-            $pdf->Cell(130, 10, $label, 1);
-            $pdf->Cell(60, 10, '$' . number_format($amount, 2), 1);
-            $pdf->Ln();
-        }
-
-        // === Add Bar Chart ===
-        $barChart = WRITEPATH . 'reports/bar_chart.png';
-        if (file_exists($barChart)) {
-            $pdf->Ln(10);
-            $pdf->SetFont('Arial', 'B', 12);
-            $pdf->Cell(0, 10, 'Summary Graph', 0, 1);
-            $pdf->Image($barChart, null, null, 180);
-        }
-
-        // === Add Pie Chart ===
-        $pieChart = WRITEPATH . 'reports/pie_chart.png';
-        if (file_exists($pieChart)) {
-            $pdf->Ln(10);
-            $pdf->SetFont('Arial', 'B', 12);
-            $pdf->Cell(0, 10, 'Expense Breakdown', 0, 1);
-            $pdf->Image($pieChart, null, null, 120);
-        }
-
-        // Output file
-        $pdf->Output('D', 'Financial_Report_' . $data['schoolYear'] . '.pdf');
-        exit;
-    }
-
-    private function generateBarChart(array $data)
-    {
-        $chartData = [
-            'type' => 'bar',
-            'data' => [
-                'labels' => ['Charges', 'Paid', 'Unpaid', 'Discounts', 'Refunds', 'Expenses', 'Reimbursements', 'Net'],
-                'datasets' => [[
-                    'label' => 'Amount (USD)',
-                    'data' => [
-                        $data['totalCharges'],
-                        $data['amountCollected'],
-                        $data['totalUnpaid'],
-                        $data['totalDiscounts'],
-                        $data['totalRefunds'],
-                        $data['totalExpenses'],
-                        $data['totalReimbursements'],
-                        $data['netAmount'],
-                    ],
-                    'backgroundColor' => 'rgba(54, 162, 235, 0.6)',
-                ]]
-            ]
-        ];
-
-        $url = 'https://quickchart.io/chart?c=' . urlencode(json_encode($chartData));
-        file_put_contents(WRITEPATH . 'reports/bar_chart.png', file_get_contents($url));
-    }
-
-    private function generatePieChart(array $data)
-    {
-        $chartData = [
-            'type' => 'pie',
-            'data' => [
-                'labels' => ['Expenses', 'Reimbursements'],
-                'datasets' => [[
-                    'data' => [
-                        $data['totalExpenses'],
-                        $data['totalReimbursements'],
-                    ],
-                    'backgroundColor' => ['#e74c3c', '#8e44ad']
-                ]]
-            ]
-        ];
-
-        $url = 'https://quickchart.io/chart?c=' . urlencode(json_encode($chartData));
-        file_put_contents(WRITEPATH . 'reports/pie_chart.png', file_get_contents($url));
-    }
-
-    private function getFinancialSummary(?string $dateFrom = null, ?string $dateTo = null, ?string $schoolYear = null): array
-    {
-        $invoiceModel = new \App\Models\InvoiceModel();
-        $paymentModel = new \App\Models\PaymentModel();
-        $refundModel = new \App\Models\RefundModel();
-        $expenseModel = new \App\Models\ExpenseModel();
-        $reimbursementModel = new \App\Models\ReimbursementModel();
-        $discountModel = new \App\Models\DiscountUsageModel();
-        $configModel = new \App\Models\ConfigurationModel();
-        $additionalModel = new \App\Models\AdditionalChargeModel();
-
-        // Allow override via parameter; fallback to configured year
-        $schoolYear = $schoolYear ?: $configModel->getConfig('school_year');
-        $derivedDateFrom = null;
-        $derivedDateTo   = null;
-        if (!empty($schoolYear) && empty($dateFrom) && empty($dateTo)) {
-            if (preg_match('/^(\\d{4})[^\\d]?(\\d{4})$/', $schoolYear, $m)) {
-                $derivedDateFrom = $m[1] . '-01-01';
-                $derivedDateTo   = $m[2] . '-12-31';
-            }
-        }
-
-        $db = \Config\Database::connect();
-
-        // === Invoices: Total Charges ===
-        $invoiceBuilder = $invoiceModel->where('school_year', $schoolYear);
-        $invoiceDateFrom = $dateFrom ?: $derivedDateFrom;
-        $invoiceDateTo   = $dateTo   ?: $derivedDateTo;
-        if (!empty($invoiceDateFrom)) {
-            $invoiceBuilder->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) >=', $invoiceDateFrom);
-        }
-        if (!empty($invoiceDateTo)) {
-            $invoiceBuilder->where('DATE(COALESCE(invoices.issue_date, invoices.created_at)) <=', $invoiceDateTo);
-        }
-        $invoices = $invoiceBuilder->findAll();
-        $totalCharges = array_sum(array_column($invoices, 'total_amount'));
-        $invoiceIds = array_values(array_unique(array_filter(array_map(static function ($inv) {
-            $id = (int)($inv['id'] ?? 0);
-            return $id > 0 ? $id : null;
-        }, $invoices))));
-
-        // === Additional Charges ===
-        $hasExplicitDates = !empty($dateFrom) || !empty($dateTo);
-        $sumExpr = "COALESCE(SUM(ac.amount), 0) AS amount";
-
-        $acAllBuilder = $db->table('additional_charges ac')
-            ->select($sumExpr, false)
-            ->where('ac.school_year', $schoolYear)
-            ->where('ac.status !=', 'void');
-        if ($hasExplicitDates) {
-            if (!empty($dateFrom)) $acAllBuilder->where('DATE(ac.due_date) >=', $dateFrom);
-            if (!empty($dateTo)) $acAllBuilder->where('DATE(ac.due_date) <=', $dateTo);
-        }
-        $acAllRow = $acAllBuilder->get()->getRowArray();
-        $totalExtraCharges = isset($acAllRow['amount']) ? (float) $acAllRow['amount'] : 0.00;
-
-        // Extra charges not reflected in invoice totals (unapplied or missing invoice_id)
-        $extraByParent = [];
-        $extraChargesUnapplied = 0.0;
-        $acExtraBuilder = $db->table('additional_charges ac')
-            ->select('ac.parent_id, ' . $sumExpr, false)
-            ->where('ac.school_year', $schoolYear)
-            ->where('ac.status !=', 'void')
-            ->groupStart()
-                ->where('ac.invoice_id IS NULL', null, false)
-                ->orWhere('ac.invoice_id', 0)
-                ->orWhere('ac.status !=', 'applied')
-            ->groupEnd()
-            ->groupBy('ac.parent_id');
-        if ($hasExplicitDates) {
-            if (!empty($dateFrom)) $acExtraBuilder->where('DATE(ac.due_date) >=', $dateFrom);
-            if (!empty($dateTo)) $acExtraBuilder->where('DATE(ac.due_date) <=', $dateTo);
-        }
-        $acExtraRows = $acExtraBuilder->get()->getResultArray();
-        foreach ($acExtraRows as $row) {
-            $pid = (int)($row['parent_id'] ?? 0);
-            if ($pid <= 0) continue;
-            $amt = (float)($row['amount'] ?? 0);
-            if (abs($amt) < 0.00001) continue;
-            $extraByParent[$pid] = $amt;
-            $extraChargesUnapplied += $amt;
-        }
-
-        $totalCharges += $extraChargesUnapplied;
-
-        // === Payments: Total Paid ===
-        $paymentBuilder = $paymentModel->where('school_year', $schoolYear);
-        if (!empty($invoiceDateFrom)) {
-            $paymentBuilder->where('DATE(payment_date) >=', $invoiceDateFrom);
-        }
-        if (!empty($invoiceDateTo)) {
-            $paymentBuilder->where('DATE(payment_date) <=', $invoiceDateTo);
-        }
-        $payHasStatus = $db->fieldExists('status', 'payments');
-        $payHasVoid   = $db->fieldExists('is_void', 'payments');
-        if ($payHasStatus) {
-            $paymentBuilder->groupStart()
-                ->whereNotIn('status', ['void','voided','refunded','failed','chargeback','declined','reversed','canceled','cancelled'])
-                ->orWhere('status IS NULL', null, false)
-                ->groupEnd();
-        }
-        if ($payHasVoid) {
-            $paymentBuilder->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-                ->groupEnd();
-        }
-        $paymentResult = $paymentBuilder->selectSum('paid_amount')->get()->getRowArray();
-        $totalPaid = isset($paymentResult['paid_amount']) ? (float) $paymentResult['paid_amount'] : 0.00;
-
-        // === Per-invoice paid/discount/refund totals for outstanding balance ===
-        $paidByInvoice = [];
-        $discountByInvoice = [];
-        $refundByInvoice = [];
-        if (!empty($invoiceIds)) {
-            $paidRows = $db->table('payments')
-                ->select('invoice_id, COALESCE(SUM(paid_amount),0) AS total_paid')
-                ->whereIn('invoice_id', $invoiceIds);
-            if (!empty($schoolYear)) {
-                $paidRows->where('school_year', $schoolYear);
-            }
-            if (!empty($invoiceDateFrom)) {
-                $paidRows->where('DATE(payment_date) >=', $invoiceDateFrom);
-            }
-            if (!empty($invoiceDateTo)) {
-                $paidRows->where('DATE(payment_date) <=', $invoiceDateTo);
-            }
-            if ($payHasStatus) {
-                $paidRows->groupStart()
-                    ->whereNotIn('status', ['void','voided','refunded','failed','chargeback','declined','reversed','canceled','cancelled'])
-                    ->orWhere('status IS NULL', null, false)
-                    ->groupEnd();
-            }
-            if ($payHasVoid) {
-                $paidRows->groupStart()
-                    ->where('is_void', 0)
-                    ->orWhere('is_void IS NULL', null, false)
-                    ->groupEnd();
-            }
-            $paidRows = $paidRows->groupBy('invoice_id')->get()->getResultArray();
-            foreach ($paidRows as $r) {
-                $iid = (int)($r['invoice_id'] ?? 0);
-                if ($iid > 0) $paidByInvoice[$iid] = (float)($r['total_paid'] ?? 0);
-            }
-
-            $discRows = $db->table('discount_usages')
-                ->select('invoice_id, COALESCE(SUM(discount_amount),0) AS total_disc')
-                ->whereIn('invoice_id', $invoiceIds);
-            if (!empty($dateFrom)) {
-                $discRows->where('DATE(COALESCE(used_at, created_at)) >=', $dateFrom);
-            }
-            if (!empty($dateTo)) {
-                $discRows->where('DATE(COALESCE(used_at, created_at)) <=', $dateTo);
-            }
-            $discRows = $discRows->groupBy('invoice_id')->get()->getResultArray();
-            foreach ($discRows as $r) {
-                $iid = (int)($r['invoice_id'] ?? 0);
-                if ($iid > 0) $discountByInvoice[$iid] = (float)($r['total_disc'] ?? 0);
-            }
-
-            $refRows = $db->table('refunds')
-                ->select('invoice_id, COALESCE(SUM(refund_paid_amount),0) AS total_refund')
-                ->whereIn('invoice_id', $invoiceIds)
-                ->whereIn('status', ['Partial', 'Paid']);
-            if (!empty($dateFrom)) {
-                $refRows->where('DATE(COALESCE(refunded_at, created_at)) >=', $dateFrom);
-            }
-            if (!empty($dateTo)) {
-                $refRows->where('DATE(COALESCE(refunded_at, created_at)) <=', $dateTo);
-            }
-            $refRows = $refRows->groupBy('invoice_id')->get()->getResultArray();
-            foreach ($refRows as $r) {
-                $iid = (int)($r['invoice_id'] ?? 0);
-                if ($iid > 0) $refundByInvoice[$iid] = (float)($r['total_refund'] ?? 0);
-            }
-        }
-
-        // === Expenses ===
-        $expenseBuilder = $expenseModel->where('school_year', $schoolYear);
-        if (!empty($invoiceDateFrom)) {
-            $expenseBuilder->where('DATE(created_at) >=', $invoiceDateFrom);
-        }
-        if (!empty($invoiceDateTo)) {
-            $expenseBuilder->where('DATE(created_at) <=', $invoiceDateTo);
-        }
-        $expenseResult = $expenseBuilder->selectSum('amount')->get()->getRowArray();
-        $totalExpenses = isset($expenseResult['amount']) ? (float) $expenseResult['amount'] : 0.00;
-
-        // === Reimbursements ===
-        // Reimbursements: include rows missing school_year by falling back to expense.school_year
-        $normalizeYear = static function (?string $year): string {
-            return preg_replace('/[^0-9]/', '', (string) $year);
-        };
-        $normalizedYear = $normalizeYear($schoolYear);
-
-        $reimbBuilder = $db->table('reimbursements r')
-            ->select('SUM(r.amount) AS amount')
-            ->join('expenses e', 'e.id = r.expense_id', 'left');
-        if (!empty($schoolYear)) {
-            $reimbBuilder
-                ->groupStart()
-                    ->groupStart()
-                        ->where('r.school_year', $schoolYear)
-                        ->orWhere(
-                            "REPLACE(REPLACE(REPLACE(REPLACE(r.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '')",
-                            $normalizedYear
-                        )
-                    ->groupEnd()
-                    ->orGroupStart()
-                        ->where('r.school_year IS NULL', null, false)
-                        ->groupStart()
-                            ->where('e.school_year', $schoolYear)
-                            ->orWhere(
-                                "REPLACE(REPLACE(REPLACE(REPLACE(e.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '')",
-                                $normalizedYear
-                            )
-                        ->groupEnd()
-                    ->groupEnd()
-                ->groupEnd();
-        }
-        if (!empty($invoiceDateFrom)) {
-            $reimbBuilder->where('DATE(COALESCE(r.created_at, e.created_at)) >=', $invoiceDateFrom);
-        }
-        if (!empty($invoiceDateTo)) {
-            $reimbBuilder->where('DATE(COALESCE(r.created_at, e.created_at)) <=', $invoiceDateTo);
-        }
-        $reimbursementResult = $reimbBuilder->get()->getRowArray();
-        $totalReimbursements = isset($reimbursementResult['amount']) ? (float) $reimbursementResult['amount'] : 0.00;
-
-        // Fallback: include closed batch items that never created a reimbursement record
-        $batchFallback = $db->table('reimbursement_batch_items bi')
-            ->select('SUM(e.amount) AS amount')
-            ->join('reimbursement_batches b', 'b.id = bi.batch_id', 'inner')
-            ->join('expenses e', 'e.id = bi.expense_id', 'inner')
-            ->join('reimbursements r', 'r.expense_id = e.id', 'left')
-            ->where('b.status', 'closed')
-            ->where('bi.unassigned_at IS NULL', null, false)
-            ->where('r.id IS NULL');
-        if (!empty($schoolYear)) {
-            $batchFallback
-                ->groupStart()
-                    ->where('e.school_year', $schoolYear)
-                    ->orWhere(
-                        "REPLACE(REPLACE(REPLACE(REPLACE(e.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '')",
-                        $normalizedYear
-                    )
-                ->groupEnd();
-        }
-        if (!empty($invoiceDateFrom)) {
-            $batchFallback->where('DATE(COALESCE(e.created_at, b.closed_at)) >=', $invoiceDateFrom);
-        }
-        if (!empty($invoiceDateTo)) {
-            $batchFallback->where('DATE(COALESCE(e.created_at, b.closed_at)) <=', $invoiceDateTo);
-        }
-        $batchFallbackRow = $batchFallback->get()->getRowArray();
-        $fallbackAmount = isset($batchFallbackRow['amount']) ? (float) $batchFallbackRow['amount'] : 0.00;
-        $totalReimbursements += $fallbackAmount;
-
-        // Donations line: donations captured as expenses (category=Donation) plus legacy Masjid/Donation reimbursements.
-        $donationExpense = 0.0;
-        $donationExpenseBuilder = (new ExpenseModel())
-            ->where('school_year', $schoolYear)
-            ->where('category', 'Donation');
-        if (!empty($invoiceDateFrom)) {
-            $donationExpenseBuilder->where('DATE(created_at) >=', $invoiceDateFrom);
-        }
-        if (!empty($invoiceDateTo)) {
-            $donationExpenseBuilder->where('DATE(created_at) <=', $invoiceDateTo);
-        }
-        $donationExpenseRow = $donationExpenseBuilder->selectSum('amount')->get()->getRowArray();
-        $donationExpense = isset($donationExpenseRow['amount']) ? (float) $donationExpenseRow['amount'] : 0.00;
-
-        $donationReimb = 0.0;
-        $specialRecipientIds = array_map('intval', array_keys(ReimbursementController::SPECIAL_RECIPIENTS));
-        if (!empty($specialRecipientIds)) {
-            $donationBuilder = $db->table('reimbursements r')
-                ->select('SUM(r.amount) AS amount')
-                ->join('expenses e', 'e.id = r.expense_id', 'left')
-                ->whereIn('r.reimbursed_to', $specialRecipientIds);
-            if (!empty($schoolYear)) {
-                $donationBuilder
-                    ->groupStart()
-                        ->groupStart()
-                            ->where('r.school_year', $schoolYear)
-                            ->orWhere(
-                                "REPLACE(REPLACE(REPLACE(REPLACE(r.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '')",
-                                $normalizedYear
-                            )
-                        ->groupEnd()
-                        ->orGroupStart()
-                            ->where('r.school_year IS NULL', null, false)
-                            ->groupStart()
-                                ->where('e.school_year', $schoolYear)
-                                ->orWhere(
-                                    "REPLACE(REPLACE(REPLACE(REPLACE(e.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '')",
-                                    $normalizedYear
-                                )
-                            ->groupEnd()
-                        ->groupEnd()
-                    ->groupEnd();
-            }
-            if (!empty($invoiceDateFrom)) {
-                $donationBuilder->where('DATE(COALESCE(r.created_at, e.created_at)) >=', $invoiceDateFrom);
-            }
-            if (!empty($invoiceDateTo)) {
-                $donationBuilder->where('DATE(COALESCE(r.created_at, e.created_at)) <=', $invoiceDateTo);
-            }
-            $donationRow = $donationBuilder->get()->getRowArray();
-            $donationReimb = isset($donationRow['amount']) ? (float) $donationRow['amount'] : 0.00;
-        }
-
-        $donationToSchool = $donationExpense + $donationReimb;
-        $totalReimbursements = max(0.0, $totalReimbursements - $donationReimb);
-
-        // === Refunds ===
-        $refundBuilder = $refundModel
-            ->where('school_year', $schoolYear)
-            ->whereIn('status', ['Partial', 'Paid'])
-            ->where('refund_paid_amount IS NOT NULL');
-
-        if (!empty($dateFrom)) {
-            $refundBuilder->where('DATE(COALESCE(refunded_at, created_at)) >=', $dateFrom);
-        }
-        if (!empty($dateTo)) {
-            $refundBuilder->where('DATE(COALESCE(refunded_at, created_at)) <=', $dateTo);
-        }
-
-        $refundResult = $refundBuilder
-            ->selectSum('refund_paid_amount')
-            ->get()
-            ->getRowArray();
-
-        $totalRefunds = isset($refundResult['refund_paid_amount']) ? (float) $refundResult['refund_paid_amount'] : 0.00;
-
-        // === Discounts ===
-        $discountBuilder = $discountModel
-            ->join('invoices', 'invoices.id = discount_usages.invoice_id')
-            ->where('invoices.school_year', $schoolYear);
-        if (!empty($dateFrom)) {
-            $discountBuilder->where('DATE(COALESCE(discount_usages.used_at, discount_usages.created_at)) >=', $dateFrom);
-        }
-        if (!empty($dateTo)) {
-            $discountBuilder->where('DATE(COALESCE(discount_usages.used_at, discount_usages.created_at)) <=', $dateTo);
-        }
-        $discountResult = $discountBuilder->selectSum('discount_amount')->get()->getRowArray();
-        $totalDiscounts = isset($discountResult['discount_amount']) ? (float) $discountResult['discount_amount'] : 0.00;
-
-        // === Net & Unpaid ===
-        // Sum positive per-parent balances (per-invoice balance + unapplied extra charges)
-        $parentBalances = [];
-        foreach ($invoices as $inv) {
-            $iid = (int)($inv['id'] ?? 0);
-            $pid = (int)($inv['parent_id'] ?? 0);
-            if ($iid <= 0 || $pid <= 0) continue;
-            $total = (float)($inv['total_amount'] ?? 0);
-            $paid  = (float)($paidByInvoice[$iid] ?? 0);
-            $disc  = (float)($discountByInvoice[$iid] ?? 0);
-            $ref   = (float)($refundByInvoice[$iid] ?? 0);
-            $bal   = max(0.0, round($total - $disc - $paid - $ref, 2));
-            if (!isset($parentBalances[$pid])) $parentBalances[$pid] = 0.0;
-            $parentBalances[$pid] += $bal;
-        }
-        foreach ($extraByParent as $pid => $extra) {
-            if (!isset($parentBalances[$pid])) $parentBalances[$pid] = 0.0;
-            $parentBalances[$pid] += (float)$extra;
-        }
-        $totalUnpaid = 0.0;
-        foreach ($parentBalances as $bal) {
-            if ($bal > 0.00001) $totalUnpaid += $bal;
-        }
-        $amountCollected = $totalPaid;
-        $netAmount = ($totalCharges - $totalDiscounts - $totalRefunds);
-
-        return [
-            'schoolYear' => $schoolYear,
-            'dateFrom' => $dateFrom,
-            'dateTo' => $dateTo,
-            'totalCharges' => $totalCharges,
-            'totalExtraCharges' => $totalExtraCharges,
-            'totalDiscounts' => $totalDiscounts,
-            'totalRefunds' => $totalRefunds,
-            'totalExpenses' => $totalExpenses,
-            'totalReimbursements' => $totalReimbursements,
-            'donationToSchool' => $donationToSchool,
-            'totalPaid' => $totalPaid,
-            'amountCollected' => $amountCollected,
-            'totalUnpaid' => $totalUnpaid,
-            'netAmount' => $netAmount,
-        ];
-    }
-
-
-    /**
-     * Management page: list parents with outstanding balances (> 0) for a school year.
-     * Supports HTML and JSON (Accept: application/json or format=json).
-     */
-    public function unpaidParents()
-    {
-        $configModel = new \App\Models\ConfigurationModel();
-        $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
-        if ($schoolYear === '') {
-            $schoolYear = (string) ($configModel->getConfig('school_year') ?? date('Y'));
-        }
-
-        // Build school year options from invoices
-        $schoolYears = [];
-        try {
-            $db = \Config\Database::connect();
-            $rows = $db->table('invoices')
-                ->select('DISTINCT school_year', false)
-                ->where('school_year IS NOT NULL', null, false)
-                ->orderBy('school_year', 'DESC')
-                ->get()->getResultArray();
-            foreach ($rows as $r) {
-                $val = (string)($r['school_year'] ?? '');
-                if ($val !== '' && !in_array($val, $schoolYears, true)) $schoolYears[] = $val;
-            }
-        } catch (\Throwable $e) {}
-        if (empty($schoolYears) && !empty($schoolYear)) {
-            $schoolYears[] = (string)$schoolYear;
-        }
-
-        // Aggregate balances by parent for selected school year
-        // IMPORTANT: Compute current balance = total - payments - discounts - refundsPaid
-        // rather than trusting invoices.balance which may become stale.
-        $db = \Config\Database::connect();
-        $invRows = $db->table('invoices i')
-            ->select('i.id, i.parent_id, i.total_amount, u.firstname, u.lastname, u.email')
-            ->join('users u', 'u.id = i.parent_id', 'inner')
-            ->where('i.school_year', $schoolYear)
-            ->orderBy('i.parent_id', 'ASC')
-            ->orderBy('i.id', 'ASC')
-            ->get()->getResultArray();
-
-        // Group by parent and compute balances dynamically
-        $byParent = [];
-        $paymentsTbl = 'payments';
-        $hasStatus   = $db->fieldExists('status', $paymentsTbl);
-        $hasVoid     = $db->fieldExists('is_void', $paymentsTbl);
-
-        foreach ($invRows as $r) {
-            $iid = (int)($r['id'] ?? 0);
-            $pid = (int)($r['parent_id'] ?? 0);
-            if ($iid <= 0 || $pid <= 0) continue;
-
-            // Sum payments for this invoice (exclude void/failed if such columns exist)
-            $qb = $db->table('payments')->select('COALESCE(SUM(paid_amount),0) AS tot')->where('invoice_id', $iid);
-            if ($hasStatus) {
-                $qb->groupStart()
-                    ->whereNotIn('status', ['void','voided','refunded','failed','chargeback','declined','reversed','canceled','cancelled'])
-                    ->orWhere('status IS NULL', null, false)
-                   ->groupEnd();
-            }
-            if ($hasVoid) {
-                $qb->groupStart()
-                    ->where('is_void', 0)
-                    ->orWhere('is_void IS NULL', null, false)
-                   ->groupEnd();
-            }
-            $paidRow   = $qb->get()->getRowArray();
-            $paidSum   = (float)($paidRow['tot'] ?? 0);
-
-            // Sum discounts for this invoice
-            $discRow = $db->table('discount_usages')
-                ->select('COALESCE(SUM(discount_amount),0) AS tot')
-                ->where('invoice_id', $iid)
-                ->get()->getRowArray();
-            $discSum = (float)($discRow['tot'] ?? 0);
-
-            // Sum refunds PAID for this invoice (Partial/Paid only)
-            $refRow = $db->table('refunds')
-                ->select('COALESCE(SUM(refund_paid_amount),0) AS tot')
-                ->where('invoice_id', $iid)
-                ->whereIn('status', ['Partial','Paid'])
-                ->get()->getRowArray();
-            $refSum = (float)($refRow['tot'] ?? 0);
-
-            $total   = (float)($r['total_amount'] ?? 0);
-            $balance = max(0.0, round($total - $discSum - $paidSum - $refSum, 2));
-
-            if (!isset($byParent[$pid])) {
-                $byParent[$pid] = [
-                    'parent_id'     => $pid,
-                    'firstname'     => (string)($r['firstname'] ?? ''),
-                    'lastname'      => (string)($r['lastname'] ?? ''),
-                    'email'         => (string)($r['email'] ?? ''),
-                    'total_invoice' => 0.0,
-                    'total_balance' => 0.0,
-                    'total_paid'    => 0.0,
-                    'total_discount'=> 0.0,
-                ];
-            }
-            $byParent[$pid]['total_invoice'] += $total;
-            $byParent[$pid]['total_balance'] += $balance;
-            $byParent[$pid]['total_paid']    += $paidSum; // aggregated payments (for type classification)
-            $byParent[$pid]['total_discount']+= $discSum;
-        }
-
-        // Add extra charges not yet applied to invoices (or missing invoice_id)
-        $extraRows = $db->table('additional_charges ac')
-            ->select(
-                "ac.parent_id,
-                 u.firstname,
-                 u.lastname,
-                 u.email,
-                 COALESCE(SUM(ac.amount), 0) AS total_extra",
-                false
-            )
-            ->join('users u', 'u.id = ac.parent_id', 'left')
-            ->where('ac.school_year', $schoolYear)
-            ->where('ac.status !=', 'void')
-            ->groupStart()
-                ->where('ac.invoice_id IS NULL', null, false)
-                ->orWhere('ac.invoice_id', 0)
-                ->orWhere('ac.status !=', 'applied')
-            ->groupEnd()
-            ->groupBy('ac.parent_id')
-            ->get()
-            ->getResultArray();
-
-        foreach ($extraRows as $er) {
-            $pid = (int)($er['parent_id'] ?? 0);
-            if ($pid <= 0) continue;
-            $extra = (float)($er['total_extra'] ?? 0);
-            if (abs($extra) < 0.00001) continue;
-            if (!isset($byParent[$pid])) {
-                $byParent[$pid] = [
-                    'parent_id'     => $pid,
-                    'firstname'     => (string)($er['firstname'] ?? ''),
-                    'lastname'      => (string)($er['lastname'] ?? ''),
-                    'email'         => (string)($er['email'] ?? ''),
-                    'total_invoice' => 0.0,
-                    'total_balance' => 0.0,
-                    'total_paid'    => 0.0,
-                    'total_discount'=> 0.0,
-                ];
-            }
-            $byParent[$pid]['total_invoice'] += $extra;
-            $byParent[$pid]['total_balance'] += $extra;
-        }
-
-        // Reduce into rows list; only parents with positive balance
-        // Also compute remaining installments and suggested monthly amount
-        $rows = [];
-        // Installment end date from config (same source as manual pay UI)
-        $installmentEndRaw = (string) (new \App\Models\ConfigurationModel())->getConfig('installment_date');
-        $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-        $tzNY = new \DateTimeZone($tzName);
-        $todayNY = new \DateTimeImmutable('today', $tzNY);
-        $endDate = null;
-        if ($installmentEndRaw) {
-            try { $endDate = new \DateTimeImmutable($installmentEndRaw, $tzNY); } catch (\Throwable $e) { $endDate = null; }
-        }
-        $monthsUntil = function (?\DateTimeImmutable $end) use ($todayNY): int {
-            if (!$end) return 0;
-            $y = (int)$end->format('Y') - (int)$todayNY->format('Y');
-            $m = (int)$end->format('n') - (int)$todayNY->format('n');
-            $months = $y * 12 + $m;
-            if ((int)$end->format('j') > (int)$todayNY->format('j')) $months += 1;
-            return max(0, $months);
-        };
-
-        foreach ($byParent as $pid => $agg) {
-            $balance = (float)($agg['total_balance'] ?? 0);
-            if ($balance > 0.00001) {
-                $remMonths = $monthsUntil($endDate);
-                $remainingInstallments = max(1, $remMonths);
-                $instAmount = round($balance / $remainingInstallments, 2);
-
-                $rows[] = [
-                    'parent_id'     => $pid,
-                    'firstname'     => $agg['firstname'],
-                    'lastname'      => $agg['lastname'],
-                    'email'         => $agg['email'],
-                    'total_invoice' => (float)$agg['total_invoice'],
-                    'total_balance' => $balance,
-                    'total_discount'=> (float)($agg['total_discount'] ?? 0),
-                    'remaining_installments' => $remainingInstallments,
-                    'installment_amount'     => $instAmount,
-                ];
-            }
-        }
-
-        // Order by total_balance desc (to mimic previous builder ordering)
-        usort($rows, static function ($a, $b) {
-            return ($b['total_balance'] <=> $a['total_balance']);
-        });
-
-        // Compute a global next installment date (first day of next month, local time)
-        $tz   = new \DateTimeZone($tzName);
-        $now  = new \DateTime('now', $tz);
-        $nextInstallmentDt = (clone $now)->modify('first day of next month');
-        $nextInstallmentYmd = $nextInstallmentDt->format('Y-m-d');
-
-        // Determine whether each parent has any payments for this year (installment vs no_payment)
-        $parentIds = array_values(array_unique(array_map(static fn($r) => (int)($r['parent_id'] ?? 0), $rows)));
-        $hasPayments = [];
-        $paidTotals  = [];
-        $paymentCounts = [];
-        if (!empty($parentIds)) {
-            try {
-                $pRows = $db->table('payments')
-                    ->select('parent_id, SUM(paid_amount) AS total_paid, COUNT(*) AS payment_count')
-                    ->whereIn('parent_id', $parentIds)
-                    ->where('school_year', $schoolYear)
-                    ->groupBy('parent_id')
-                    ->get()->getResultArray();
-                foreach ($pRows as $pr) {
-                    $pid = (int)($pr['parent_id'] ?? 0);
-                    if ($pid > 0) {
-                        $hasPayments[$pid] = true;
-                        $paidTotals[$pid]  = (float)($pr['total_paid'] ?? 0);
-                        $paymentCounts[$pid] = (int)($pr['payment_count'] ?? 0);
-                    }
-                }
-            } catch (\Throwable $e) {
-                // ignore; default type will be 'no_payment'
-            }
-        }
-
-        $dataRows = array_map(function(array $r) use ($hasPayments, $paidTotals, $paymentCounts, $nextInstallmentYmd) {
-            $pid = (int)($r['parent_id'] ?? 0);
-            $name = trim((string)($r['firstname'] ?? '') . ' ' . (string)($r['lastname'] ?? ''));
-            return [
-                'parent_id'     => $pid,
-                'parent_name'   => $name,
-                'email'         => (string)($r['email'] ?? ''),
-                'total_invoice' => (float)($r['total_invoice'] ?? 0),
-                'total_balance' => (float)($r['total_balance'] ?? 0),
-                'total_discount'=> (float)($r['total_discount'] ?? 0),
-                'remaining_installments' => (int)($r['remaining_installments'] ?? 0),
-                'installment_amount'     => (float)($r['installment_amount'] ?? 0),
-                'type'          => isset($hasPayments[$pid]) ? 'installment' : 'no_payment',
-                'total_paid'    => isset($paidTotals[$pid]) ? (float)$paidTotals[$pid] : 0.0,
-                'payment_count' => isset($paymentCounts[$pid]) ? (int)$paymentCounts[$pid] : 0,
-                'has_installment'=> isset($hasPayments[$pid]) ? 1 : 0,
-                'next_installment' => $nextInstallmentYmd,
-            ];
-        }, $rows);
-
-        if ($this->wantsJson() || strtolower((string)($this->request->getGet('format') ?? '')) === 'json') {
-            return $this->response->setJSON([
-                'ok'          => true,
-                'school_year' => $schoolYear,
-                'schoolYears' => $schoolYears,
-                'results'     => $dataRows,
-                'csrf_token'  => csrf_token(),
-                'csrf_hash'   => csrf_hash(),
-            ]);
-        }
-
-        return view('payment/unpaid_parents', [
-            'school_year' => $schoolYear,
-            'schoolYears' => $schoolYears,
-            'rows'        => $dataRows,
-        ]);
-    }
-
-
-
-
-}
diff --git a/app/Http/Controllers/old/FlagController.php b/app/Http/Controllers/old/FlagController.php
deleted file mode 100644
index 6e6e7eff..00000000
--- a/app/Http/Controllers/old/FlagController.php
+++ /dev/null
@@ -1,568 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\CurrentFlagModel;
-use App\Models\FlagModel;
-use App\Models\StudentModel;
-use App\Models\ClassSectionModel;
-use App\Models\StudentClassModel;
-use App\Models\ConfigurationModel;
-
-use CodeIgniter\Controller;
-
-
-class FlagController extends Controller
-{
-    protected $userModel;
-    protected $db;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-        //$this->userModel = new UserModel();
-        helper(['url', 'form']);
-    }
-
-    public function index()
-    {
-        $currentFlagModel = new CurrentFlagModel();
-        $classSectionModel = new ClassSectionModel();
-        $studentClassModel = new StudentClassModel();
-        $configModel = new ConfigurationModel();
-
-        // Format grades with id and name for passing to the view
-        $grades = [];
-
-        // Retrieve flags and class sections that currently have active students
-        $flags = $currentFlagModel->findAll();
-        $schoolYear = $configModel->getConfig('school_year');
-        $studentCounts = $studentClassModel->getStudentCountsBySection($schoolYear);
-        $classSections = [];
-
-        if (!empty($studentCounts)) {
-            $classSectionIdsWithStudents = array_keys($studentCounts);
-            $classSections = $classSectionModel
-                ->orderBy('class_section_name', 'ASC')
-                ->whereIn('class_section_id', $classSectionIdsWithStudents)
-                ->findAll();
-        }
-
-        foreach ($classSections as $section) {
-            $grades[] = [
-                'id' => $section['class_section_id'],
-                'name' => $section['class_section_name']
-            ];
-        }
-
-        // Map updater user IDs to display names for the view
-        $updaterIds = [];
-        foreach ($flags as $flag) {
-            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
-                if (!empty($flag[$key])) {
-                    $updaterIds[(int)$flag[$key]] = true;
-                }
-            }
-        }
-
-        $updaterMap = [];
-        if (!empty($updaterIds)) {
-            $rows = $this->db->table('users')
-                ->select('id, firstname, lastname')
-                ->whereIn('id', array_keys($updaterIds))
-                ->get()
-                ->getResultArray();
-
-            foreach ($rows as $row) {
-                $name = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
-                $updaterMap[(int)$row['id']] = $name !== '' ? $name : ('User #' . $row['id']);
-            }
-        }
-
-        foreach ($flags as &$flag) {
-            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
-                $id = (int)($flag[$key] ?? 0);
-                $flag[$key . '_name'] = $id > 0 ? ($updaterMap[$id] ?? null) : null;
-            }
-        }
-        unset($flag);
-
-        // Pass flags and formatted grades to the view
-        return view('flags/flags_management', [
-            'flags' => $flags,
-            'grades' => $grades // Now grades include both id and class_section_name
-        ]);
-    }
-
-    public function history()
-    {
-        $flagModel = new FlagModel();
-
-        $schoolYear = (string)($this->request->getGet('school_year') ?? '');
-        $semester = (string)($this->request->getGet('semester') ?? '');
-
-        $builder = $flagModel->orderBy('flag_datetime', 'DESC');
-        if ($schoolYear !== '') {
-            $builder->where('school_year', $schoolYear);
-        }
-        if ($semester !== '') {
-            $builder->where('semester', $semester);
-        }
-
-        return $this->response->setJSON([
-            'flags' => $builder->findAll(),
-        ]);
-    }
-
-    public function processedFlags()
-    {
-        $flagModel = new FlagModel();
-        $classSectionModel = new ClassSectionModel();
-
-        $schoolYear = (string)($this->request->getGet('school_year') ?? '');
-        $semester = (string)($this->request->getGet('semester') ?? '');
-
-        $builder = $flagModel->orderBy('flag_datetime', 'DESC');
-        if ($schoolYear !== '') {
-            $builder->where('school_year', $schoolYear);
-        }
-        if ($semester !== '') {
-            $builder->where('semester', $semester);
-        }
-
-        $flags = $builder->findAll();
-
-        $gradeIds = [];
-        foreach ($flags as $flag) {
-            $gradeValue = $flag['grade'] ?? '';
-            if (is_numeric($gradeValue)) {
-                $gradeIds[(int)$gradeValue] = true;
-            }
-        }
-
-        $gradeMap = [];
-        if (!empty($gradeIds)) {
-            $rows = $classSectionModel
-                ->select('class_section_id, class_section_name')
-                ->whereIn('class_section_id', array_keys($gradeIds))
-                ->findAll();
-
-            foreach ($rows as $row) {
-                $gradeMap[(int)$row['class_section_id']] = (string)($row['class_section_name'] ?? '');
-            }
-        }
-
-        // Map updater user IDs to display names for the view
-        $updaterIds = [];
-        foreach ($flags as $flag) {
-            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
-                if (!empty($flag[$key])) {
-                    $updaterIds[(int)$flag[$key]] = true;
-                }
-            }
-        }
-
-        $updaterMap = [];
-        if (!empty($updaterIds)) {
-            $rows = $this->db->table('users')
-                ->select('id, firstname, lastname')
-                ->whereIn('id', array_keys($updaterIds))
-                ->get()
-                ->getResultArray();
-
-            foreach ($rows as $row) {
-                $name = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
-                $updaterMap[(int)$row['id']] = $name !== '' ? $name : ('User #' . $row['id']);
-            }
-        }
-
-        foreach ($flags as &$flag) {
-            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
-                $id = (int)($flag[$key] ?? 0);
-                $flag[$key . '_name'] = $id > 0 ? ($updaterMap[$id] ?? null) : null;
-            }
-
-            $gradeValue = $flag['grade'] ?? '';
-            if (is_numeric($gradeValue)) {
-                $flag['grade'] = $gradeMap[(int)$gradeValue] ?? (string)$gradeValue;
-            }
-        }
-        unset($flag);
-
-        return view('flags/processed_flags', [
-            'flags' => $flags
-        ]);
-    }
-
-    public function incidentAnalysis()
-    {
-        $flagModel = new FlagModel();
-        $classSectionModel = new ClassSectionModel();
-
-        $schoolYear = (string)($this->request->getGet('school_year') ?? '');
-        $semester = (string)($this->request->getGet('semester') ?? '');
-
-        $builder = $flagModel->orderBy('flag_datetime', 'DESC');
-        if ($schoolYear !== '') {
-            $builder->where('school_year', $schoolYear);
-        }
-        if ($semester !== '') {
-            $builder->where('semester', $semester);
-        }
-
-        $flags = $builder->findAll();
-
-        $gradeIds = [];
-        foreach ($flags as $flag) {
-            $gradeValue = $flag['grade'] ?? '';
-            if (is_numeric($gradeValue)) {
-                $gradeIds[(int)$gradeValue] = true;
-            }
-        }
-
-        $gradeMap = [];
-        if (!empty($gradeIds)) {
-            $rows = $classSectionModel
-                ->select('class_section_id, class_section_name')
-                ->whereIn('class_section_id', array_keys($gradeIds))
-                ->findAll();
-
-            foreach ($rows as $row) {
-                $gradeMap[(int)$row['class_section_id']] = (string)($row['class_section_name'] ?? '');
-            }
-        }
-
-        $students = [];
-        foreach ($flags as $flag) {
-            $studentId = (string)($flag['student_id'] ?? '');
-            $studentName = (string)($flag['student_name'] ?? '');
-            $studentKey = $studentId !== '' ? 'id:' . $studentId : 'name:' . strtolower(trim($studentName));
-            $gradeValue = $flag['grade'] ?? '';
-            $gradeLabel = $gradeValue;
-            if (is_numeric($gradeValue)) {
-                $gradeLabel = $gradeMap[(int)$gradeValue] ?? (string)$gradeValue;
-            }
-
-            if (!isset($students[$studentKey])) {
-                $students[$studentKey] = [
-                    'student_id' => $studentId,
-                    'student_name' => $studentName,
-                    'grade' => (string)$gradeLabel,
-                    'total' => 0,
-                    'open' => 0,
-                    'closed' => 0,
-                    'canceled' => 0,
-                    'last_incident' => null,
-                    'logs' => [],
-                ];
-            }
-
-            $students[$studentKey]['total'] += 1;
-
-            $state = (string)($flag['flag_state'] ?? '');
-            if ($state === 'Open') {
-                $students[$studentKey]['open'] += 1;
-            } elseif ($state === 'Closed') {
-                $students[$studentKey]['closed'] += 1;
-            } elseif ($state === 'Canceled') {
-                $students[$studentKey]['canceled'] += 1;
-            }
-
-            if ($students[$studentKey]['last_incident'] === null) {
-                $students[$studentKey]['last_incident'] = $flag['flag_datetime'] ?? null;
-            }
-
-            $students[$studentKey]['logs'][] = [
-                'flag' => $flag['flag'] ?? '',
-                'flag_state' => $state,
-                'flag_datetime' => $flag['flag_datetime'] ?? null,
-                'open_description' => $flag['open_description'] ?? null,
-                'close_description' => $flag['close_description'] ?? null,
-                'cancel_description' => $flag['cancel_description'] ?? null,
-                'action_taken' => $flag['action_taken'] ?? null,
-            ];
-        }
-
-        $studentRows = array_values($students);
-        usort($studentRows, function ($a, $b) {
-            if ($a['total'] === $b['total']) {
-                return strcasecmp($a['student_name'], $b['student_name']);
-            }
-            return $b['total'] <=> $a['total'];
-        });
-
-        return view('flags/incident_analysis', [
-            'students' => $studentRows,
-            'schoolYear' => $schoolYear,
-            'semester' => $semester,
-        ]);
-    }
-
-    public function getStudentsByGrade($gradeId)
-    {
-        $studentClassModel = new StudentClassModel(); // Model for the student_class table
-        $studentModel = new StudentModel();           // Model for the students table
-
-        // Fetch student IDs for the selected grade
-        $studentIds = $studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $gradeId)
-            ->findColumn('student_id');
-
-        // If no student IDs are found, return an empty JSON array
-        if (empty($studentIds)) {
-            return $this->response->setJSON([]);
-        }
-
-        // Fetch student details from students table using the retrieved IDs
-        $students = $studentModel
-            ->whereIn('id', $studentIds)
-            ->where('is_active', 1)
-            ->findAll();
-
-        // Prepare data for JSON response with both ID and full name
-        $studentData = [];
-        foreach ($students as $student) {
-            $studentData[] = [
-                'id' => $student['id'], // Student ID
-                'name' => $student['firstname'] . ' ' . $student['lastname'] // Full name
-            ];
-        }
-
-        // Return JSON response with student ID and full name
-        return $this->response->setJSON($studentData);
-    }
-
-    public function addFlag()
-    {
-        $currentFlagModel = new CurrentFlagModel();
-        $studentModel = new StudentModel();
-        $configModel = new ConfigurationModel();
-
-        // Get the data from the form submission
-        $studentId = $this->request->getPost('student');
-        $flagType = $this->request->getPost('flag');
-        $description = $this->request->getPost('description');
-        $flagState = $this->request->getPost('flag_state');
-        $stateDescription = $this->request->getPost('state_description'); // Additional description for "Closed" or "Canceled"
-
-        // Retrieve student information from the database
-        $student = $studentModel->find($studentId);
-        if (!$student) {
-            session()->setFlashdata('error', 'Student not found.');
-            return $this->index();
-        }
-
-        // Get the user_id from the session for updated_by
-        $userId = session()->get('user_id');
-
-        // Get the semester and school year from configuration
-        $semester = $configModel->getConfig('semester');
-        $schoolYear = $configModel->getConfig('school_year');
-
-        // Set the current system date and time for flag_datetime
-        $currentDateTime = utc_now();
-
-        // Check if a flag of the same type already exists for this student
-        $existingFlag = $currentFlagModel->where('student_id', $studentId)
-            ->where('flag', $flagType)
-            ->first();
-
-        if ($existingFlag) {
-            // If the flag exists, update it based on the new state and description
-            $data = [
-                'flag_datetime'    => $currentDateTime,
-                'updated_by_open'  => $userId
-            ];
-
-            // Append the new description to the appropriate field based on flag state
-            if ($flagState === 'Closed') {
-                $data['flag_state'] = 'Closed';
-                $data['close_description'] = ($existingFlag['close_description'] ?? '') . PHP_EOL . $stateDescription;
-            } elseif ($flagState === 'Canceled') {
-                $data['flag_state'] = 'Canceled';
-                $data['cancel_description'] = ($existingFlag['cancel_description'] ?? '') . PHP_EOL . $stateDescription;
-            } else {
-                $data['open_description'] = $existingFlag['open_description'] . PHP_EOL . $description;
-            }
-
-            // Update the existing flag
-            $currentFlagModel->update($existingFlag['id'], $data);
-            session()->setFlashdata('success', 'Flag updated successfully!');
-        } else {
-            // If no existing flag is found, prepare the data for insertion
-            $data = [
-                'student_id'        => $student['id'],
-                'student_name'      => $student['firstname'] . ' ' . $student['lastname'],
-                'grade'             => $this->request->getPost('grade'),
-                'flag'              => $flagType,
-                'flag_datetime'     => $currentDateTime,
-                'flag_state'        => 'Open', // Set initial state to 'Open'
-                'updated_by_open'   => $userId,
-                'open_description'  => $description,
-                'semester'          => $semester,
-                'school_year'       => $schoolYear
-            ];
-
-            // Insert the new flag
-            if ($currentFlagModel->insert($data)) {
-                session()->setFlashdata('success', 'New incident added successfully!');
-            } else {
-                session()->setFlashdata('error', 'Failed to add new incident.');
-            }
-        }
-        // Redirect to the list view
-        return $this->index();
-    }
-
-    public function updateState($id)
-    {
-        log_message('debug', 'updateState method called for ID: ' . $id);
-        log_message('debug', 'Flag state: ' . $this->request->getPost('flag_state'));
-
-        $currentFlagModel = new CurrentFlagModel();
-
-        // Get the new flag state from the form
-        $newState = $this->request->getPost('flag_state');
-
-        if (!$newState) {
-            session()->setFlashdata('error', 'incident state not provided.');
-            return $this->index();
-        }
-
-        // Update the flag state in the database
-        if ($currentFlagModel->update($id, ['flag_state' => $newState])) {
-            session()->setFlashdata('success', 'Incident state updated successfully!');
-        } else {
-            $errors = $currentFlagModel->errors();
-            log_message('error', 'Failed to update incident state: ' . print_r($errors, true));
-            session()->setFlashdata('error', 'Failed to update incident state.');
-        }
-
-        // Redirect back to the flags list
-        return $this->index();
-    }
-
-    public function closeFlag($flagId)
-    {
-        // Log the whole session array
-        log_message('debug', json_encode(session()->get()));
-        $currentFlagModel = new CurrentFlagModel();
-        $userId = session()->get('user_id');
-
-        // Get the current flag data
-        $flagData = $currentFlagModel->find($flagId);
-
-        // Log and check if flag data is found
-        if (!$flagData) {
-            log_message('error', "incident with ID {$flagId} not found in database.");
-            session()->setFlashdata('error', 'Incident not found.');
-            return redirect()->back();
-        }
-
-        // Proceed only if flag is not closed
-        if ($flagData['flag_state'] !== 'Closed') {
-            // Retrieve 'close_description' from POST request
-            $closeDescription = $this->request->getPost('state_description');
-            $actionTaken = $this->request->getPost('action_taken');
-
-            // Debugging: Check if the close description is received
-            if (empty($closeDescription)) {
-                session()->setFlashdata('error', 'Close description is missing.');
-                return redirect()->back();
-            }
-
-            // Update the flag state to Closed
-            $currentFlagModel->update($flagId, [
-                'flag_state' => 'Closed',
-                'updated_by_closed' => $userId,
-                'close_description' => $closeDescription, // Use dynamic description from form
-                'action_taken' => $actionTaken
-            ]);
-
-            $flagData = $currentFlagModel->find($flagId);
-            return $this->moveToHistory($flagData);
-        } else {
-            session()->setFlashdata('error', 'Incident is already closed.');
-        }
-        return $this->index();
-    }
-
-    public function cancelFlag($flagId)
-    {
-        $currentFlagModel = new CurrentFlagModel();
-        $userId = session()->get('user_id');
-
-        // Retrieve 'cancel_description' from POST request
-        $cancelDescription = $this->request->getPost('state_description');
-        $actionTaken = $this->request->getPost('action_taken');
-
-        // Get the current flag data
-        $flagData = $currentFlagModel->find($flagId);
-
-        // Check if flag data is found
-        if (!$flagData) {
-            log_message('error', "Incident with ID {$flagId} not found in database.");
-            session()->setFlashdata('error', 'Incident not found.');
-            return redirect()->back();
-        }
-
-        // Check if the flag is not already canceled
-        if ($flagData['flag_state'] !== 'Canceled') {
-            // Update the flag state to Canceled
-            $currentFlagModel->update($flagId, [
-                'flag_state' => 'Canceled',
-                'updated_by_canceled' => $userId,
-                'cancel_description' => $cancelDescription,
-                'action_taken' => $actionTaken
-            ]);
-
-            // Retrieve updated flag data to ensure latest state
-            $flagData = $currentFlagModel->find($flagId);
-            return $this->moveToHistory($flagData);
-        } else {
-            session()->setFlashdata('error', 'Incident is already canceled.');
-        }
-
-        return $this->index();
-    }
-
-
-    private function moveToHistory($flagData)
-    {
-        $flagModel = new FlagModel();
-
-        // Prepare data for the flag table
-        $dataToInsert = [
-            'student_id'            => $flagData['student_id'],
-            'student_name'          => $flagData['student_name'],
-            'grade'                 => $flagData['grade'],
-            'flag'                  => $flagData['flag'],
-            'flag_datetime'         => $flagData['flag_datetime'],
-            'flag_state'            => $flagData['flag_state'],
-            'updated_by_open'       => $flagData['updated_by_open'],
-            'open_description'      => $flagData['open_description'],
-            'updated_by_closed'     => $flagData['updated_by_closed'],
-            'close_description'     => $flagData['close_description'],
-            'action_taken'          => $flagData['action_taken'],
-            'updated_by_canceled'   => $flagData['updated_by_canceled'],
-            'cancel_description'    => $flagData['cancel_description'],
-            'semester'              => $flagData['semester'],
-            'school_year'           => $flagData['school_year'],
-            'created_at'            => $flagData['created_at'],
-            'updated_at'            => $flagData['updated_at']
-        ];
-
-        // Insert data into the flag table
-        if ($flagModel->insert($dataToInsert)) {
-            // Delete the entry from the current_flag table
-            $currentFlagModel = new CurrentFlagModel();
-            $currentFlagModel->delete($flagData['id']);
-            session()->setFlashdata('success', 'Incident has been moved to history.');
-        } else {
-            session()->setFlashdata('error', 'Failed to move incident to history.');
-        }
-
-        return $this->index();
-    }
-}
diff --git a/app/Http/Controllers/old/GradingController.php b/app/Http/Controllers/old/GradingController.php
deleted file mode 100644
index f323d6e1..00000000
--- a/app/Http/Controllers/old/GradingController.php
+++ /dev/null
@@ -1,2237 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\StudentModel;
-use App\Models\StudentClassModel;
-use App\Models\ConfigurationModel;
-use CodeIgniter\Controller;
-use CodeIgniter\Events\Events;
-use App\Models\HomeworkModel;
-use App\Models\QuizModel;
-use App\Models\ProjectModel;
-use App\Models\MidtermExamModel;
-use App\Models\FinalExamModel;
-use App\Models\SemesterScoreModel; // Assuming you use test_avg here
-use App\Models\ScoreCommentModel;
-use App\Models\TeacherClassModel;
-use App\Models\UserModel;
-use App\Models\ClassSectionModel;
-use App\Models\CalendarModel;
-use App\Models\AttendanceRecordModel;
-use App\Services\Calculators\AttendanceCalculator;
-use RuntimeException;
-use Config\Services;
-use App\Models\ParentMeetingScheduleModel;
-use App\Models\CurrentFlagModel;
-use App\Models\PlacementLevelModel;
-use App\Models\PlacementBatchModel;
-use App\Models\PlacementScoreModel;
-use App\Models\GradingLockModel;
-use App\Services\NavbarService;
-
-//use App\Models\ScoreModel;
-
-
-class GradingController extends Controller
-{
-    protected $semesterScoreService;
-    protected $db;
-    protected $configModel;
-    protected $homeworkModel;
-    protected $userModel;
-    protected $schoolYear;
-    protected $semester;
-    protected $studentClassModel;
-    protected $studentModel;
-    protected $teacherClassModel;
-    protected $classSection;
-    protected $attendanceCalculator;
-    protected $parentMeetingModel;
-    protected $placementLevelModel;
-    protected $placementBatchModel;
-    protected $placementScoreModel;
-    protected $gradingLockModel;
-
-    public function __construct()
-    {
-        // Initialize models
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->homeworkModel = new HomeworkModel();
-        $this->userModel = new UserModel();
-        $this->studentClassModel = new StudentClassModel();
-        $this->studentModel      = new StudentModel();
-        $this->configModel = new ConfigurationModel();
-        $this->db = \Config\Database::connect();
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->classSection = new ClassSectionModel();
-        $this->attendanceCalculator = new AttendanceCalculator(
-            new AttendanceRecordModel(),
-            $this->configModel,
-            new CalendarModel()
-        );
-        $this->parentMeetingModel = new ParentMeetingScheduleModel();
-        $this->placementLevelModel = new PlacementLevelModel();
-        $this->placementBatchModel = new PlacementBatchModel();
-        $this->placementScoreModel = new PlacementScoreModel();
-        $this->gradingLockModel = new GradingLockModel();
-
-        // Log the service initialization
-        log_message('debug', 'Initializing SemesterScoreService');
-
-        $this->semesterScoreService = service('semesterScoreService');
-    }
-
-    public function show($type, $classSectionId, $studentId)
-    {
-        $scoreModel = $this->getModelByType($type);
-        $studentModel = new StudentModel();
-        $configModel = new ConfigurationModel();
-
-        $schoolYear = $configModel->getConfig('school_year');
-        $semester = $configModel->getConfig('semester');
-
-        $student = $studentModel->find($studentId);
-        $scores = $scoreModel->where([
-            'student_id' => $studentId,
-            'semester' => $semester,
-            'school_year' => $schoolYear
-        ])->findAll();
-        $scoresLocked = false;
-        $classSectionIdInt = (int) ($classSectionId ?? 0);
-        if ($classSectionIdInt > 0) {
-            $scoresLocked = $this->gradingLockModel->isLocked($classSectionIdInt, $semester, $schoolYear);
-        }
-
-        return view("grading/{$type}", [
-            'student' => $student,
-            'scores' => $scores,
-            'type' => $type,
-            'classSectionId' => $classSectionId, // ✅ pass it manually
-            'semester' => $semester, // ✅ Pass semester to the view
-            'scoresLocked' => $scoresLocked,
-        ]);
-    }
-
-    private function getModelByType($type)
-    {
-        return match ($type) {
-            'homework' => new HomeworkModel(),
-            'quiz' => new QuizModel(),
-            'project' => new ProjectModel(),
-            'midterm' => new MidtermExamModel(),
-            'final' => new FinalExamModel(),
-            'test' => new SemesterScoreModel(), // Assuming you use test_avg here
-            'comments' => new ScoreCommentModel(),
-            default => throw new \InvalidArgumentException("Invalid type: $type"),
-        };
-    }
-
-    public function update()
-    {
-        $type = $this->request->getPost('type');
-        $studentId = $this->request->getPost('student_id');
-        $classSectionId = $this->request->getPost('class_section_id');
-        $configModel = new ConfigurationModel();
-        $studentModel = new StudentModel();
-
-        $schoolYear = $configModel->getConfig('school_year');
-        $semester = $configModel->getConfig('semester');
-
-        $model = $this->getModelByType($type);
-        $classSectionIdInt = (int) ($classSectionId ?? 0);
-        if ($classSectionIdInt > 0 && $this->isScoresLocked($classSectionIdInt, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if (in_array($type, ['homework', 'quiz', 'project'])) {
-            $scoreIds = $this->request->getPost('score_ids');
-            $scores = $this->request->getPost('scores');
-            $comments = $this->request->getPost('comments');
-
-            foreach ($scoreIds as $i => $id) {
-                $model->update($id, [
-                    'score' => $scores[$i],
-                    'comment' => $comments[$i] ?? null,
-                    'updated_at' => utc_now()
-                ]);
-            }
-        } elseif (in_array($type, ['midterm', 'final', 'test'])) {
-            $score = $this->request->getPost('score');
-
-            $data = [
-                'score' => $score,
-                'updated_at' => utc_now()
-            ];
-
-            $existing = $model->where([
-                'student_id' => $studentId,
-                'class_section_id' => $classSectionId,
-                'semester' => $semester,
-                'school_year' => $schoolYear
-            ])->first();
-
-            if ($existing) {
-                $model->update($existing['id'], $data);
-            } else {
-                $data += [
-                    'student_id' => $studentId,
-                    'class_section_id' => $classSectionId,
-                    'semester' => $semester,
-                    'school_year' => $schoolYear,
-                    'created_at' => utc_now()
-                ];
-                $model->insert($data);
-            }
-        } elseif ($type === 'comments') {
-            $comment = $this->request->getPost('comment');
-
-            $model->where([
-                'student_id' => $studentId,
-                'semester' => $semester,
-                'school_year' => $schoolYear
-            ])->delete(); // Remove existing comments of this type (optional)
-
-            $model->insert([
-                'student_id' => $studentId,
-                'score_type' => 'general',
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-                'comment' => $comment,
-                'commented_by' => session()->get('user_id'),
-                'created_at' => utc_now()
-            ]);
-        }
-
-        $studentTeacherInfo = $studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        return redirect()->back()->with('status', 'Scores updated successfully.');
-    }
-
-    public function grading()
-    {
-        $schoolYear = (string) $this->schoolYear;
-        $configuredSemester = (string) $this->semester;
-        $requestedClassId = (int) ($this->request->getGet('class_id') ?? 0);
-        $semesterOptions = $this->getSemestersForSchoolYear($schoolYear, $configuredSemester);
-        $session = session();
-        $requestedSemester = $this->normalizeSemesterInput($this->request->getGet('semester'));
-        $sessionSemester = $this->normalizeSemesterInput($session->get('grading_selected_semester'));
-        $effectiveRequested = $requestedSemester ?? $sessionSemester;
-        $semester = trim($this->resolveSemesterSelection($effectiveRequested, $semesterOptions, $configuredSemester));
-        if ($semester === '') {
-            $semester = $configuredSemester !== '' ? $configuredSemester : ($semesterOptions[0] ?? 'Fall');
-        }
-        if (!in_array($semester, $semesterOptions, true)) {
-            $semesterOptions[] = $semester;
-        }
-        $semesterOptions = array_values(array_unique($semesterOptions));
-        $session->set('grading_selected_semester', $semester);
-
-        $this->ensureParentReleaseKeyExists('Fall');
-        $this->ensureParentReleaseKeyExists('Spring');
-        $scoresReleased = $this->getParentScoresReleasedForSemester($semester);
-        $scoresReleasedFall = $this->getParentScoresReleasedForSemester('Fall');
-        $scoresReleasedSpring = $this->getParentScoresReleasedForSemester('Spring');
-
-        // Refresh PTAP/semester scores for the requested class (if provided) so values are present.
-        if ($requestedClassId > 0 && $this->semesterScoreService !== null) {
-            $sectionIds = $this->classSection
-                ->select('class_section_id')
-                ->where('class_id', $requestedClassId)
-                ->findAll();
-
-            $sectionIds = array_values(array_filter(array_map(
-                static fn($row) => (int)($row['class_section_id'] ?? 0),
-                $sectionIds
-            ), static fn($id) => $id > 0));
-
-            foreach ($sectionIds as $sectionId) {
-                $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId(
-                    $sectionId,
-                    $semester,
-                    $schoolYear
-                );
-                if (empty($studentTeacherInfo)) {
-                    continue;
-                }
-                try {
-                    $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-                } catch (\Throwable $e) {
-                    log_message(
-                        'error',
-                        'GradingController::grading score refresh failed for section '
-                        . $sectionId . ': ' . $e->getMessage()
-                    );
-                }
-            }
-        }
-
-        // Normalize the semester text for safe comparison
-        $semEsc = $this->db->escape($semester);
-        $yrEsc  = $this->db->escape($schoolYear);
-
-        $rows = $this->buildGradingRows($semEsc, $yrEsc, $schoolYear);
-
-        // Preload quiz/homework/project/participation/midterm score counts to distinguish true zeros from empty scores
-        $quizCounts = [];
-        $homeworkCounts = [];
-        $projectCounts = [];
-        $participationCounts = [];
-        $midtermCounts = [];
-        if (!empty($rows)) {
-            $sectionIds = [];
-            $studentIds = [];
-            foreach ($rows as $r) {
-                $sid = (int) ($r['student_id'] ?? 0);
-                $sec = (int) ($r['section_id'] ?? 0);
-                if ($sid > 0) $studentIds[$sid] = true;
-                if ($sec > 0) $sectionIds[$sec] = true;
-            }
-            $sectionIds = array_keys($sectionIds);
-            $studentIds = array_keys($studentIds);
-
-            if (!empty($sectionIds) && !empty($studentIds)) {
-                $quizRows = $this->db->table('quiz')
-                    ->select('student_id, class_section_id, COUNT(*) AS cnt')
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->whereIn('class_section_id', $sectionIds)
-                    ->whereIn('student_id', $studentIds)
-                    ->where('score IS NOT NULL', null, false)
-                    ->groupBy('student_id, class_section_id')
-                    ->get()->getResultArray();
-
-                foreach ($quizRows as $qr) {
-                    $sec = (int) ($qr['class_section_id'] ?? 0);
-                    $sid = (int) ($qr['student_id'] ?? 0);
-                    if ($sec > 0 && $sid > 0) {
-                        $quizCounts[$sec][$sid] = (int) ($qr['cnt'] ?? 0);
-                    }
-                }
-
-                $hwRows = $this->db->table('homework')
-                    ->select('student_id, class_section_id, COUNT(*) AS cnt')
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->whereIn('class_section_id', $sectionIds)
-                    ->whereIn('student_id', $studentIds)
-                    ->where('score IS NOT NULL', null, false)
-                    ->groupBy('student_id, class_section_id')
-                    ->get()->getResultArray();
-
-                foreach ($hwRows as $hr) {
-                    $sec = (int) ($hr['class_section_id'] ?? 0);
-                    $sid = (int) ($hr['student_id'] ?? 0);
-                    if ($sec > 0 && $sid > 0) {
-                        $homeworkCounts[$sec][$sid] = (int) ($hr['cnt'] ?? 0);
-                    }
-                }
-
-                $projectRows = $this->db->table('project')
-                    ->select('student_id, class_section_id, COUNT(*) AS cnt')
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->whereIn('class_section_id', $sectionIds)
-                    ->whereIn('student_id', $studentIds)
-                    ->where('score IS NOT NULL', null, false)
-                    ->groupBy('student_id, class_section_id')
-                    ->get()->getResultArray();
-
-                foreach ($projectRows as $pr) {
-                    $sec = (int) ($pr['class_section_id'] ?? 0);
-                    $sid = (int) ($pr['student_id'] ?? 0);
-                    if ($sec > 0 && $sid > 0) {
-                        $projectCounts[$sec][$sid] = (int) ($pr['cnt'] ?? 0);
-                    }
-                }
-
-                $participationRows = $this->db->table('participation')
-                    ->select('student_id, class_section_id, COUNT(*) AS cnt')
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->whereIn('class_section_id', $sectionIds)
-                    ->whereIn('student_id', $studentIds)
-                    ->where('score IS NOT NULL', null, false)
-                    ->groupBy('student_id, class_section_id')
-                    ->get()->getResultArray();
-
-                foreach ($participationRows as $par) {
-                    $sec = (int) ($par['class_section_id'] ?? 0);
-                    $sid = (int) ($par['student_id'] ?? 0);
-                    if ($sec > 0 && $sid > 0) {
-                        $participationCounts[$sec][$sid] = (int) ($par['cnt'] ?? 0);
-                    }
-                }
-
-                $midtermRows = $this->db->table('midterm_exam')
-                    ->select('student_id, class_section_id, COUNT(*) AS cnt')
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->whereIn('class_section_id', $sectionIds)
-                    ->whereIn('student_id', $studentIds)
-                    ->where('score IS NOT NULL', null, false)
-                    ->groupBy('student_id, class_section_id')
-                    ->get()->getResultArray();
-
-                foreach ($midtermRows as $mr) {
-                    $sec = (int) ($mr['class_section_id'] ?? 0);
-                    $sid = (int) ($mr['student_id'] ?? 0);
-                    if ($sec > 0 && $sid > 0) {
-                        $midtermCounts[$sec][$sid] = (int) ($mr['cnt'] ?? 0);
-                    }
-                }
-            }
-        }
-
-        // If any section is missing PTAP or semester score, refresh and reload once
-        $sectionsNeedingRefresh = [];
-        foreach ($rows as $r) {
-            $sectionId = (int) ($r['section_id'] ?? 0);
-            if ($sectionId <= 0) continue;
-            $ptapMissing = $r['ss_ptap_score'] === null;
-            $semMissing  = $r['ss_semester_score'] === null;
-            if ($ptapMissing || $semMissing) {
-                $sectionsNeedingRefresh[$sectionId] = true;
-            }
-        }
-
-        if (!empty($sectionsNeedingRefresh) && $this->semesterScoreService !== null) {
-            foreach (array_keys($sectionsNeedingRefresh) as $sectionId) {
-                $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId(
-                    $sectionId,
-                    $semester,
-                    $schoolYear
-                );
-                if (empty($studentTeacherInfo)) {
-                    continue;
-                }
-                try {
-                    $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-                } catch (\Throwable $e) {
-                    log_message(
-                        'error',
-                        'GradingController::grading refresh missing scores for section '
-                        . $sectionId . ': ' . $e->getMessage()
-                    );
-                }
-            }
-            // Reload rows after refresh
-            $rows = $this->buildGradingRows($semEsc, $yrEsc, $schoolYear);
-        }
-
-        // Build structures keyed by BUSINESS section id
-        $grades            = []; // class_id => [ ['class_section_id','class_section_name'], ... ]
-        $studentsBySection = []; // section_id => [ students... ]
-
-        foreach ($rows as $r) {
-            $sectionId   = (int) ($r['section_id'] ?? 0);   // BUSINESS id
-            $classId     = (int) ($r['class_id'] ?? 0);
-            $sectionName = (string) ($r['class_section_name'] ?? '');
-            if ($sectionId <= 0 || $classId <= 0) continue;
-
-            if (!isset($grades[$classId])) $grades[$classId] = [];
-            $exists = false;
-            foreach ($grades[$classId] as $s) {
-                if ((int)$s['class_section_id'] === $sectionId) {
-                    $exists = true;
-                    break;
-                }
-            }
-            if (!$exists) {
-                $grades[$classId][] = [
-                    'class_section_id'   => $sectionId,
-                    'class_section_name' => $sectionName,
-                ];
-            }
-
-            $sid = (int) ($r['student_id'] ?? 0);
-            if ($sid <= 0) continue;
-
-            $ptapScore     = $r['ss_ptap_score'] ?? null;
-            $semesterScore = $r['ss_semester_score'] ?? null;
-
-            $attendanceScore = $this->calculateAttendanceScoreForStudent(
-                $sid,
-                $semester,
-                $schoolYear,
-                $sectionId
-            );
-            if ($attendanceScore === null) {
-                $rawAttendance = $r['ss_attendance_score'] ?? null;
-                if ($rawAttendance !== null && $rawAttendance !== '') {
-                    $attendanceScore = round((float) $rawAttendance, 2);
-                }
-            }
-            $homeworkAvg = isset($r['ss_homework_avg']) && $r['ss_homework_avg'] !== '' ? round((float) $r['ss_homework_avg'], 2) : null;
-            if ($homeworkAvg !== null && (float) $homeworkAvg === 0.0) {
-                $hwCount = (int) ($homeworkCounts[$sectionId][$sid] ?? 0);
-                if ($hwCount === 0) {
-                    $homeworkAvg = null;
-                }
-            }
-
-            $projectAvg = isset($r['ss_project_avg']) && $r['ss_project_avg'] !== '' ? round((float) $r['ss_project_avg'], 2) : null;
-            if ($projectAvg !== null && (float) $projectAvg === 0.0) {
-                $prCount = (int) ($projectCounts[$sectionId][$sid] ?? 0);
-                if ($prCount === 0) {
-                    $projectAvg = null;
-                }
-            }
-
-            $participationScore = isset($r['ss_participation_score']) && $r['ss_participation_score'] !== '' ? round((float) $r['ss_participation_score'], 2) : null;
-            if ($participationScore !== null && (float) $participationScore === 0.0) {
-                $pCount = (int) ($participationCounts[$sectionId][$sid] ?? 0);
-                if ($pCount === 0) {
-                    $participationScore = null;
-                }
-            }
-
-            $midtermExam = isset($r['ss_midterm_exam_score']) && $r['ss_midterm_exam_score'] !== '' ? round((float) $r['ss_midterm_exam_score'], 2) : null;
-            if ($midtermExam !== null && (float) $midtermExam === 0.0) {
-                $mCount = (int) ($midtermCounts[$sectionId][$sid] ?? 0);
-                if ($mCount === 0) {
-                    $midtermExam = null;
-                }
-            }
-
-            $quizAvg = isset($r['ss_quiz_avg']) && $r['ss_quiz_avg'] !== '' ? round((float) $r['ss_quiz_avg'], 2) : null;
-            if ($quizAvg !== null && (float) $quizAvg === 0.0) {
-                $quizCount = (int) ($quizCounts[$sectionId][$sid] ?? 0);
-                if ($quizCount === 0) {
-                    $quizAvg = null;
-                }
-            }
-
-            $studentsBySection[$sectionId][] = [
-                'id'             => $sid,
-                'school_id'      => $r['school_id'] ?? null,
-                'firstname'      => $r['firstname'] ?? null,
-                'lastname'       => $r['lastname'] ?? null,
-                'class_id'       => $classId,
-                'ptap'           => is_null($ptapScore) ? null : round((float) $ptapScore, 2),
-                'semester_score' => is_null($semesterScore) ? null : round((float) $semesterScore, 2),
-                'attendance'     => $attendanceScore,
-                'homework_avg'   => $homeworkAvg,
-                'project_avg'    => $projectAvg,
-                'quiz_avg'       => $quizAvg,
-                'participation'  => $participationScore,
-                'midterm_exam'   => $midtermExam,
-                'final_exam'     => isset($r['ss_final_exam_score']) && $r['ss_final_exam_score'] !== '' ? round((float) $r['ss_final_exam_score'], 2) : null,
-                'matched_biz_csid' => $r['matched_biz_csid'] ?? null,
-                'matched_pk_csid'  => $r['matched_pk_csid'] ?? null,
-                'placement_level' => $r['placement_level'] ?? null,
-            ];
-        }
-
-        $scoreLocks = [];
-        $lockSectionIds = [];
-        foreach ($grades as $sections) {
-            foreach ($sections as $section) {
-                $sid = (int) ($section['class_section_id'] ?? 0);
-                if ($sid > 0) {
-                    $lockSectionIds[$sid] = true;
-                }
-            }
-        }
-        $lockSectionIds = array_keys($lockSectionIds);
-        if (!empty($lockSectionIds)) {
-            $lockRows = $this->gradingLockModel
-                ->whereIn('class_section_id', $lockSectionIds)
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->findAll();
-            foreach ($lockRows as $row) {
-                $scoreLocks[(int) ($row['class_section_id'] ?? 0)] = !empty($row['is_locked']);
-            }
-        }
-
-        return view('grading/grading_main', [
-            'grades'            => $grades,
-            'studentsBySection' => $studentsBySection,
-            'semester'          => $semester,
-            'schoolYear'        => $schoolYear,
-            'requestedClassId'  => $requestedClassId,
-            'semesterOptions'   => $semesterOptions,
-            'scoresReleased'    => $scoresReleased,
-            'scoresReleasedFall' => $scoresReleasedFall,
-            'scoresReleasedSpring' => $scoresReleasedSpring,
-            'scoreLocks'        => $scoreLocks,
-        ]);
-    }
-
-    public function toggleScoreLock()
-    {
-        $classSectionId = (int) ($this->request->getPost('class_section_id') ?? 0);
-        $semester = trim((string) ($this->request->getPost('semester') ?? $this->semester));
-        $schoolYear = trim((string) ($this->request->getPost('school_year') ?? $this->schoolYear));
-
-        if ($classSectionId <= 0 || $semester === '' || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing class section or term.');
-        }
-
-        $existing = $this->gradingLockModel->getLock($classSectionId, $semester, $schoolYear);
-        $userId = (int) (session()->get('user_id') ?? 0);
-
-        if (!empty($existing) && !empty($existing['is_locked'])) {
-            $this->gradingLockModel->update($existing['id'], [
-                'is_locked' => 0,
-                'locked_by' => null,
-                'locked_at' => null,
-            ]);
-            return redirect()->back()->with('status', 'Scores unlocked for this class.');
-        }
-
-        if (!empty($existing)) {
-            $this->gradingLockModel->update($existing['id'], [
-                'is_locked' => 1,
-                'locked_by' => $userId > 0 ? $userId : null,
-                'locked_at' => utc_now(),
-            ]);
-        } else {
-            $this->gradingLockModel->insert([
-                'class_section_id' => $classSectionId,
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-                'is_locked' => 1,
-                'locked_by' => $userId > 0 ? $userId : null,
-                'locked_at' => utc_now(),
-            ]);
-        }
-
-        return redirect()->back()->with('status', 'Scores locked for this class.');
-    }
-
-    public function lockAllScores()
-    {
-        $semester = trim((string) ($this->request->getPost('semester') ?? $this->semester));
-        $schoolYear = trim((string) ($this->request->getPost('school_year') ?? $this->schoolYear));
-
-        if ($semester === '' || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing semester or school year.');
-        }
-
-        $sectionRows = $this->classSection
-            ->select('class_section_id')
-            ->groupBy('class_section_id')
-            ->findAll();
-
-        $sectionIds = array_values(array_filter(array_map(
-            static fn($row) => (int) ($row['class_section_id'] ?? 0),
-            $sectionRows
-        ), static fn($id) => $id > 0));
-
-        if (empty($sectionIds)) {
-            return redirect()->back()->with('error', 'No class sections found to lock.');
-        }
-
-        $existingLocks = $this->gradingLockModel
-            ->whereIn('class_section_id', $sectionIds)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $existingBySection = [];
-        foreach ($existingLocks as $row) {
-            $sid = (int) ($row['class_section_id'] ?? 0);
-            if ($sid > 0) {
-                $existingBySection[$sid] = $row;
-            }
-        }
-
-        $userId = (int) (session()->get('user_id') ?? 0);
-        $now = utc_now();
-        $insertRows = [];
-
-        foreach ($sectionIds as $sid) {
-            if (!empty($existingBySection[$sid])) {
-                if (!empty($existingBySection[$sid]['is_locked'])) {
-                    continue;
-                }
-                $this->gradingLockModel->update($existingBySection[$sid]['id'], [
-                    'is_locked' => 1,
-                    'locked_by' => $userId > 0 ? $userId : null,
-                    'locked_at' => $now,
-                ]);
-                continue;
-            }
-
-            $insertRows[] = [
-                'class_section_id' => $sid,
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-                'is_locked' => 1,
-                'locked_by' => $userId > 0 ? $userId : null,
-                'locked_at' => $now,
-                'created_at' => $now,
-                'updated_at' => $now,
-            ];
-        }
-
-        if (!empty($insertRows)) {
-            $this->gradingLockModel->insertBatch($insertRows);
-        }
-
-        return redirect()->back()->with('status', 'Scores locked for all classes.');
-    }
-
-    private function isScoresLocked(int $classSectionId, string $semester, string $schoolYear): bool
-    {
-        return $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-    }
-
-    public function updatePlacementLevel()
-    {
-        $studentId = (int) ($this->request->getPost('student_id') ?? 0);
-        $levelRaw = trim((string) ($this->request->getPost('placement_level') ?? ''));
-        $schoolYear = (string) ($this->request->getPost('school_year') ?? $this->schoolYear);
-
-        if ($studentId <= 0 || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing student or school year.');
-        }
-
-        $level = $levelRaw === '' ? null : (int) $levelRaw;
-        if ($level !== null && !in_array($level, [1, 2, 3], true)) {
-            return redirect()->back()->with('error', 'Invalid placement level.');
-        }
-
-        $existing = $this->placementLevelModel
-            ->where('student_id', $studentId)
-            ->where('school_year', $schoolYear)
-            ->first();
-
-        if ($level === null) {
-            if ($existing) {
-                $this->placementLevelModel->delete($existing['id']);
-            }
-            return redirect()->back()->with('status', 'Placement level cleared.');
-        }
-
-        $payload = [
-            'student_id' => $studentId,
-            'school_year' => $schoolYear,
-            'level' => $level,
-            'updated_by' => session()->get('user_id'),
-        ];
-
-        if ($existing) {
-            $this->placementLevelModel->update($existing['id'], $payload);
-        } else {
-            $payload['created_by'] = session()->get('user_id');
-            $this->placementLevelModel->insert($payload);
-        }
-
-        return redirect()->back()->with('status', 'Placement level updated.');
-    }
-
-    public function placement()
-    {
-        $classSectionId = (int) ($this->request->getGet('class_section_id') ?? 0);
-        $schoolYear = (string) ($this->request->getGet('school_year') ?? $this->schoolYear);
-        $placementTest = (string) ($this->request->getGet('placement_test') ?? '');
-        $openFlag = (string) ($this->request->getGet('open') ?? '');
-
-        if ($classSectionId <= 0 || $schoolYear === '') {
-            $showStudents = ($placementTest !== '' && $openFlag === '1');
-            $students = $showStudents ? $this->fetchActiveStudentsWithSection($schoolYear) : [];
-            $batches = $this->fetchPlacementBatches($schoolYear);
-            $batchDetails = $this->fetchPlacementBatchDetails($batches, $schoolYear);
-            return view('grading/placement_index', [
-                'schoolYear' => $schoolYear,
-                'students' => $students,
-                'batches' => $batches,
-                'batchDetails' => $batchDetails,
-                'placementTest' => $placementTest,
-                'showStudents' => $showStudents,
-            ]);
-        }
-
-        $sectionName = $this->classSection->getClassSectionNameBySectionId($classSectionId) ?? '';
-        $classId = $this->classSection->getClassId($classSectionId);
-
-        $students = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, null, $schoolYear);
-        $studentIds = array_values(array_filter(array_map(
-            static fn($row) => (int) ($row['student_id'] ?? 0),
-            $students
-        ), static fn($id) => $id > 0));
-
-        $levels = [];
-        if (!empty($studentIds)) {
-            $rows = $this->placementLevelModel
-                ->whereIn('student_id', $studentIds)
-                ->where('school_year', $schoolYear)
-                ->findAll();
-            foreach ($rows as $row) {
-                $levels[(int) $row['student_id']] = $row['level'] ?? null;
-            }
-        }
-
-        return view('grading/placement', [
-            'classSectionId' => $classSectionId,
-            'classSectionName' => $sectionName,
-            'classId' => $classId,
-            'schoolYear' => $schoolYear,
-            'students' => $students,
-            'levels' => $levels,
-        ]);
-    }
-
-    public function updatePlacementLevels()
-    {
-        $classSectionId = (int) ($this->request->getPost('class_section_id') ?? 0);
-        $schoolYear = (string) ($this->request->getPost('school_year') ?? $this->schoolYear);
-        $levels = $this->request->getPost('placement_level') ?? [];
-
-        if ($classSectionId <= 0 || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing class section or school year.');
-        }
-
-        $students = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, null, $schoolYear);
-        $validIds = array_values(array_filter(array_map(
-            static fn($row) => (int) ($row['student_id'] ?? 0),
-            $students
-        ), static fn($id) => $id > 0));
-
-        $validSet = array_flip($validIds);
-        $existingRows = [];
-        if (!empty($validIds)) {
-            $rows = $this->placementLevelModel
-                ->whereIn('student_id', $validIds)
-                ->where('school_year', $schoolYear)
-                ->findAll();
-            foreach ($rows as $row) {
-                $existingRows[(int) $row['student_id']] = $row;
-            }
-        }
-
-        $userId = session()->get('user_id');
-        foreach ($levels as $studentIdRaw => $levelRaw) {
-            $studentId = (int) $studentIdRaw;
-            if (!isset($validSet[$studentId])) {
-                continue;
-            }
-            $levelRaw = trim((string) $levelRaw);
-            $level = $levelRaw === '' ? null : (int) $levelRaw;
-            if ($level !== null && !in_array($level, [1, 2, 3], true)) {
-                continue;
-            }
-
-            if ($level === null) {
-                if (isset($existingRows[$studentId])) {
-                    $this->placementLevelModel->delete($existingRows[$studentId]['id']);
-                }
-                continue;
-            }
-
-            $payload = [
-                'student_id' => $studentId,
-                'school_year' => $schoolYear,
-                'level' => $level,
-                'updated_by' => $userId,
-            ];
-
-            if (isset($existingRows[$studentId])) {
-                $this->placementLevelModel->update($existingRows[$studentId]['id'], $payload);
-            } else {
-                $payload['created_by'] = $userId;
-                $this->placementLevelModel->insert($payload);
-            }
-        }
-
-        return redirect()->back()->with('status', 'Placement levels updated.');
-    }
-
-    public function updatePlacementLevelsAll()
-    {
-        $schoolYear = (string) ($this->request->getPost('school_year') ?? $this->schoolYear);
-        $placementTest = (string) ($this->request->getPost('placement_test') ?? '');
-        $levels = $this->request->getPost('placement_level') ?? [];
-
-        if ($schoolYear === '' || $placementTest === '') {
-            return redirect()->back()->with('error', 'Missing placement test or school year.');
-        }
-
-        $students = $this->fetchActiveStudentsWithSection($schoolYear);
-        $validIds = array_values(array_filter(array_map(
-            static fn($row) => (int) ($row['student_id'] ?? 0),
-            $students
-        ), static fn($id) => $id > 0));
-
-        $validSet = array_flip($validIds);
-        $userId = session()->get('user_id');
-
-        $batchId = $this->placementBatchModel->insert([
-            'placement_test' => $placementTest,
-            'school_year' => $schoolYear,
-            'created_by' => $userId,
-            'updated_by' => $userId,
-        ]);
-
-        if (!$batchId) {
-            return redirect()->back()->with('error', 'Unable to create placement batch.');
-        }
-
-        $savedCount = 0;
-        foreach ($levels as $studentIdRaw => $levelRaw) {
-            $studentId = (int) $studentIdRaw;
-            if (!isset($validSet[$studentId])) {
-                continue;
-            }
-            $levelRaw = trim((string) $levelRaw);
-            if ($levelRaw === '') {
-                continue;
-            }
-            $level = (int) $levelRaw;
-            if ($level < 0 || $level > 100) {
-                continue;
-            }
-
-            $this->placementScoreModel->insert([
-                'batch_id' => (int) $batchId,
-                'student_id' => $studentId,
-                'score' => $level,
-                'created_by' => $userId,
-                'updated_by' => $userId,
-            ]);
-            $savedCount++;
-        }
-
-        if ($savedCount === 0) {
-            $this->placementBatchModel->delete((int) $batchId);
-            return redirect()->back()->with('error', 'No scores entered. Batch not saved.');
-        }
-
-        return redirect()->to(base_url('grading/placement'))
-            ->with('status', 'Placement batch saved.');
-    }
-
-    public function editPlacementBatch(int $batchId)
-    {
-        $batch = $this->placementBatchModel->find($batchId);
-        if (!$batch) {
-            return redirect()->to(base_url('grading/placement'))
-                ->with('error', 'Placement batch not found.');
-        }
-
-        $schoolYear = (string) ($batch['school_year'] ?? $this->schoolYear);
-        $students = $this->fetchActiveStudentsWithSection($schoolYear);
-        $scores = $this->fetchPlacementScoresForBatch($batchId);
-
-        return view('grading/placement_batch', [
-            'batch' => $batch,
-            'students' => $students,
-            'scores' => $scores,
-        ]);
-    }
-
-    public function updatePlacementBatch(int $batchId)
-    {
-        $batch = $this->placementBatchModel->find($batchId);
-        if (!$batch) {
-            return redirect()->to(base_url('grading/placement'))
-                ->with('error', 'Placement batch not found.');
-        }
-
-        $schoolYear = (string) ($batch['school_year'] ?? $this->schoolYear);
-        $levels = $this->request->getPost('placement_level') ?? [];
-
-        $students = $this->fetchActiveStudentsWithSection($schoolYear);
-        $validIds = array_values(array_filter(array_map(
-            static fn($row) => (int) ($row['student_id'] ?? 0),
-            $students
-        ), static fn($id) => $id > 0));
-
-        $validSet = array_flip($validIds);
-        $existing = $this->fetchPlacementScoresForBatch($batchId);
-
-        $userId = session()->get('user_id');
-        foreach ($levels as $studentIdRaw => $scoreRaw) {
-            $studentId = (int) $studentIdRaw;
-            if (!isset($validSet[$studentId])) {
-                continue;
-            }
-            $scoreRaw = trim((string) $scoreRaw);
-            if ($scoreRaw === '') {
-                if (isset($existing[$studentId])) {
-                    $this->placementScoreModel->delete($existing[$studentId]['id']);
-                }
-                continue;
-            }
-            $score = (int) $scoreRaw;
-            if ($score < 0 || $score > 100) {
-                continue;
-            }
-
-            if (isset($existing[$studentId])) {
-                $this->placementScoreModel->update($existing[$studentId]['id'], [
-                    'score' => $score,
-                    'updated_by' => $userId,
-                ]);
-            } else {
-                $this->placementScoreModel->insert([
-                    'batch_id' => $batchId,
-                    'student_id' => $studentId,
-                    'score' => $score,
-                    'created_by' => $userId,
-                    'updated_by' => $userId,
-                ]);
-            }
-        }
-
-        $this->placementBatchModel->update($batchId, [
-            'updated_by' => $userId,
-        ]);
-
-        return redirect()->to(base_url('grading/placement'))
-            ->with('status', 'Placement batch updated.');
-    }
-
-    private function fetchActiveStudentsWithSection(string $schoolYear): array
-    {
-        return $this->db->table('students s')
-            ->select('s.id AS student_id, s.school_id, s.firstname, s.lastname, sc.class_section_id, cs.class_section_name, c.class_name')
-            ->join('student_class sc', 'sc.student_id = s.id AND sc.school_year = ' . $this->db->escape($schoolYear), 'left')
-            ->join('`classSection` cs', 'cs.class_section_id = sc.class_section_id', 'left')
-            ->join('classes c', 'c.id = cs.class_id', 'left')
-            ->where('s.is_active', 1)
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()
-            ->getResultArray();
-    }
-
-    private function fetchPlacementBatches(string $schoolYear): array
-    {
-        return $this->placementBatchModel
-            ->where('school_year', $schoolYear)
-            ->orderBy('created_at', 'DESC')
-            ->findAll();
-    }
-
-    private function fetchPlacementBatchDetails(array $batches, string $schoolYear): array
-    {
-        if (empty($batches)) {
-            return [];
-        }
-
-        $batchIds = array_values(array_filter(array_map(
-            static fn($row) => (int) ($row['id'] ?? 0),
-            $batches
-        ), static fn($id) => $id > 0));
-
-        if (empty($batchIds)) {
-            return [];
-        }
-
-        $rows = $this->db->table('placement_scores ps')
-            ->select('ps.batch_id, ps.score, s.school_id, s.firstname, s.lastname, cs.class_section_name, c.class_name')
-            ->join('students s', 's.id = ps.student_id', 'inner')
-            ->join('student_class sc', 'sc.student_id = s.id AND sc.school_year = ' . $this->db->escape($schoolYear), 'left')
-            ->join('`classSection` cs', 'cs.class_section_id = sc.class_section_id', 'left')
-            ->join('classes c', 'c.id = cs.class_id', 'left')
-            ->whereIn('ps.batch_id', $batchIds)
-            ->where('s.is_active', 1)
-            ->orderBy('ps.batch_id', 'ASC')
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()
-            ->getResultArray();
-
-        $details = [];
-        foreach ($rows as $row) {
-            $bid = (int) ($row['batch_id'] ?? 0);
-            if ($bid <= 0) continue;
-            $details[$bid][] = $row;
-        }
-
-        return $details;
-    }
-
-    private function fetchPlacementScoresForBatch(int $batchId): array
-    {
-        $rows = $this->placementScoreModel
-            ->where('batch_id', $batchId)
-            ->findAll();
-        $scores = [];
-        foreach ($rows as $row) {
-            $scores[(int) $row['student_id']] = $row;
-        }
-        return $scores;
-    }
-
-    public function belowSixty()
-    {
-        $configuredSemester = (string) $this->semester;
-        $configuredYear = (string) $this->schoolYear;
-
-        $requestedSemester = trim((string)($this->request->getGet('semester') ?? ''));
-        $requestedYear = trim((string)($this->request->getGet('school_year') ?? ''));
-
-        $semester = $requestedSemester !== '' ? $requestedSemester : ($configuredSemester !== '' ? $configuredSemester : 'Fall');
-        $schoolYear = $requestedYear !== '' ? $requestedYear : $configuredYear;
-
-        $schoolYears = $this->getSchoolYearsForScores($schoolYear);
-        $rows = $this->fetchBelowSixtyRows($schoolYear, $semester);
-
-        $canViewGrading = $this->userHasMenuUrl('grading');
-
-        return view('grading/below_sixty', [
-            'rows' => $rows,
-            'semester' => $semester,
-            'schoolYear' => $schoolYear,
-            'schoolYears' => $schoolYears,
-            'canViewGrading' => $canViewGrading,
-        ]);
-    }
-
-    public function editBelowSixtyEmail()
-    {
-        $studentId = (int)$this->request->getGet('student_id');
-        $semester = trim((string)$this->request->getGet('semester'));
-        $schoolYear = trim((string)$this->request->getGet('school_year'));
-
-        if ($studentId <= 0 || $semester === '' || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing student or term.');
-        }
-
-        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
-        if (empty($row)) {
-            return redirect()->back()->with('error', 'Student record not found for the selected term.');
-        }
-
-        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
-        $subject = $this->buildBelowSixtySubject($studentName, $semester, $schoolYear);
-        $parentName = $this->fetchBelowSixtyParentName($studentId);
-
-        $scores = [
-            'homework_avg' => $row['homework_avg'] ?? null,
-            'project_avg' => $row['project_avg'] ?? null,
-            'participation_score' => $row['participation_score'] ?? null,
-            'test_avg' => $row['test_avg'] ?? null,
-            'ptap_score' => $row['ptap_score'] ?? null,
-            'attendance_score' => $row['attendance_score'] ?? null,
-            'midterm_exam_score' => $row['midterm_exam_score'] ?? null,
-            'semester_score' => $row['semester_score'] ?? null,
-        ];
-
-        $emailData = [
-            'title'              => $subject,
-            'parent_name'        => $parentName,
-            'student_name'       => $studentName !== '' ? $studentName : 'your student',
-            'class_section_name' => $row['class_section_name'] ?? '',
-            'semester'           => $semester,
-            'school_year'        => $schoolYear,
-            'scores'             => $scores,
-            'comment'            => $row['comment'] ?? '',
-            'sent_at'            => utc_now(),
-        ];
-
-        $html = view('emails/below_sixty_performance', $emailData, ['saveData' => true]);
-
-        return view('grading/below_sixty_email_editor', [
-            'studentId' => $studentId,
-            'studentName' => $studentName,
-            'semester' => $semester,
-            'schoolYear' => $schoolYear,
-            'subject' => $subject,
-            'html' => $html,
-        ]);
-    }
-
-    public function sendBelowSixtyEmail()
-    {
-        $studentId = (int)$this->request->getPost('student_id');
-        $semester = trim((string)$this->request->getPost('semester'));
-        $schoolYear = trim((string)$this->request->getPost('school_year'));
-        $subjectInput = trim((string)$this->request->getPost('subject'));
-        $htmlInput = (string)($this->request->getPost('html') ?? '');
-
-        if ($studentId <= 0 || $semester === '' || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing student or term.');
-        }
-
-        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
-        if (empty($row)) {
-            return redirect()->back()->with('error', 'Student record not found for the selected term.');
-        }
-
-        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
-        $subject = $subjectInput !== ''
-            ? $subjectInput
-            : $this->buildBelowSixtySubject($studentName, $semester, $schoolYear);
-        $scores = [
-            'homework_avg' => $row['homework_avg'] ?? null,
-            'project_avg' => $row['project_avg'] ?? null,
-            'participation_score' => $row['participation_score'] ?? null,
-            'test_avg' => $row['test_avg'] ?? null,
-            'ptap_score' => $row['ptap_score'] ?? null,
-            'attendance_score' => $row['attendance_score'] ?? null,
-            'midterm_exam_score' => $row['midterm_exam_score'] ?? null,
-            'semester_score' => $row['semester_score'] ?? null,
-        ];
-
-        $payload = [
-            'student_id' => $studentId,
-            'student_name' => $studentName,
-            'class_section_name' => $row['class_section_name'] ?? '',
-            'semester' => $semester,
-            'school_year' => $schoolYear,
-            'scores' => $scores,
-            'comment' => $row['comment'] ?? '',
-            'subject' => $subject,
-        ];
-
-        if (trim($htmlInput) !== '') {
-            $payload['html'] = $htmlInput;
-        }
-
-        Events::trigger('below60.email', $payload);
-
-        return redirect()->back()->with('status', 'Email sent to parent(s).');
-    }
-
-    public function updateBelowSixtyStatus()
-    {
-        $studentId = (int)$this->request->getPost('student_id');
-        $semester = trim((string)$this->request->getPost('semester'));
-        $schoolYear = trim((string)$this->request->getPost('school_year'));
-        $status = trim((string)$this->request->getPost('status'));
-        $note = trim((string)$this->request->getPost('note'));
-
-        if ($studentId <= 0 || $semester === '' || $schoolYear === '' || $status === '') {
-            return redirect()->back()->with('error', 'Missing required status data.');
-        }
-
-        $status = ucfirst(strtolower($status));
-        if (!in_array($status, ['Open', 'Closed'], true)) {
-            return redirect()->back()->with('error', 'Invalid status.');
-        }
-
-        $flagModel = new CurrentFlagModel();
-        $semKey = strtolower(trim($semester));
-
-        $existing = $flagModel
-            ->where('student_id', $studentId)
-            ->where('flag', 'grade')
-            ->where('school_year', $schoolYear)
-            ->where('LOWER(TRIM(semester))', $semKey)
-            ->first();
-
-        $userId = (int)(session()->get('user_id') ?? 0) ?: null;
-        $now = utc_now();
-
-        if ($existing) {
-            $data = [
-                'flag_state' => $status,
-                'flag_datetime' => $now,
-                'updated_at' => $now,
-            ];
-            if ($status === 'Open') {
-                $data['updated_by_open'] = $userId;
-                if ($note !== '') {
-                    $prev = (string)($existing['open_description'] ?? '');
-                    $data['open_description'] = trim($prev . PHP_EOL . $note);
-                }
-            } else {
-                $data['updated_by_closed'] = $userId;
-                if ($note !== '') {
-                    $prev = (string)($existing['close_description'] ?? '');
-                    $data['close_description'] = trim($prev . PHP_EOL . $note);
-                }
-            }
-            $flagModel->update((int)$existing['id'], $data);
-        } else {
-            $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
-            $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
-            $grade = (string)($row['class_section_name'] ?? '');
-            $data = [
-                'student_id' => $studentId,
-                'student_name' => $studentName !== '' ? $studentName : 'Student',
-                'grade' => $grade,
-                'flag' => 'grade',
-                'flag_datetime' => $now,
-                'flag_state' => $status,
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-                'updated_at' => $now,
-            ];
-            if ($status === 'Open') {
-                $data['updated_by_open'] = $userId;
-                if ($note !== '') $data['open_description'] = $note;
-            } else {
-                $data['updated_by_closed'] = $userId;
-                if ($note !== '') $data['close_description'] = $note;
-            }
-            $flagModel->insert($data);
-        }
-
-        return redirect()->back()->with('status', 'Status updated.');
-    }
-
-    public function scheduleBelowSixty()
-    {
-        $studentId = (int)($this->request->getGet('student_id') ?? 0);
-        $semester = trim((string)($this->request->getGet('semester') ?? ''));
-        $schoolYear = trim((string)($this->request->getGet('school_year') ?? ''));
-
-        if ($studentId <= 0 || $semester === '' || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing student or term.');
-        }
-
-        $context = $this->fetchBelowSixtyMeetingContext($studentId, $schoolYear, $semester);
-        if (empty($context)) {
-            return redirect()->back()->with('error', 'Student record not found for the selected term.');
-        }
-
-        return view('grading/schedule_meeting', [
-            'studentId' => $studentId,
-            'studentName' => $context['student_name'],
-            'parentName' => $context['parent_name'],
-            'classSection' => $context['class_section_name'],
-            'semester' => $semester,
-            'schoolYear' => $schoolYear,
-        ]);
-    }
-
-    public function saveBelowSixtyMeeting()
-    {
-        $studentId = (int)$this->request->getPost('student_id');
-        $semester = trim((string)$this->request->getPost('semester'));
-        $schoolYear = trim((string)$this->request->getPost('school_year'));
-        $date = trim((string)$this->request->getPost('date'));
-        $time = trim((string)$this->request->getPost('time'));
-        $notes = trim((string)$this->request->getPost('notes'));
-
-        if ($studentId <= 0 || $semester === '' || $schoolYear === '' || $date === '') {
-            return redirect()->back()->withInput()->with('error', 'Missing required fields.');
-        }
-
-        $context = $this->fetchBelowSixtyMeetingContext($studentId, $schoolYear, $semester);
-        if (empty($context)) {
-            return redirect()->back()->withInput()->with('error', 'Student record not found for the selected term.');
-        }
-
-        $studentName = $context['student_name'];
-        $parentName = $context['parent_name'];
-        $classSection = $context['class_section_name'];
-        $timeLabel = $time !== '' ? (' ' . $time) : '';
-
-        $title = 'Parent Meeting: ' . $parentName . ' — ' . $studentName;
-        if ($time !== '') {
-            $title .= ' (' . $time . ')';
-        }
-
-        $descriptionParts = [];
-        $descriptionParts[] = 'Student: ' . $studentName;
-        $descriptionParts[] = 'Parent: ' . $parentName;
-        if ($classSection !== '') {
-            $descriptionParts[] = 'Section: ' . $classSection;
-        }
-        $descriptionParts[] = 'Date/Time: ' . $date . $timeLabel;
-        if ($notes !== '') {
-            $descriptionParts[] = 'Notes: ' . $notes;
-        }
-        $description = implode("\n", $descriptionParts);
-
-        $data = [
-            'student_id' => $studentId,
-            'parent_user_id' => $context['parent_user_id'] ?? null,
-            'parent_name' => $parentName,
-            'student_name' => $studentName,
-            'class_section_name' => $classSection,
-            'date' => $date,
-            'time' => $time !== '' ? $time : null,
-            'notes' => $notes !== '' ? $notes : null,
-            'semester' => $semester,
-            'school_year' => $schoolYear,
-            'status' => 'scheduled',
-            'created_by' => (int)(session()->get('user_id') ?? 0) ?: null,
-        ];
-
-        $ok = $this->parentMeetingModel->insert($data);
-        if ($ok) {
-            $query = http_build_query([
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-            ]);
-            return redirect()->to(base_url('grading/below-60') . ($query ? ('?' . $query) : ''))
-                ->with('status', 'Meeting scheduled and added to calendars.');
-        }
-
-        return redirect()->back()->withInput()->with('error', 'Failed to schedule the meeting.');
-    }
-
-    public function toggleParentScoresRelease()
-    {
-        $semester = (string) ($this->request->getPost('semester') ?? '');
-        if ($semester === '') {
-            $semester = (string) (session()->get('grading_selected_semester') ?? $this->semester);
-        }
-        $configKey = $this->getParentReleaseKey($semester) ?? 'parent_scores_released';
-
-        $releaseScoresRaw = (string) ($this->configModel->getConfig($configKey) ?? '');
-        $scoresReleased = in_array(strtolower(trim($releaseScoresRaw)), ['1', 'true', 'yes', 'y', 'on'], true);
-        $nextValue = $scoresReleased ? '0' : '1';
-
-        $ok = $this->configModel->setConfigValueByKey($configKey, $nextValue);
-        log_message('info', 'toggleParentScoresRelease', [
-            'semester' => $semester,
-            'config_key' => $configKey,
-            'prev' => $releaseScoresRaw,
-            'next' => $nextValue,
-            'ok' => $ok,
-        ]);
-
-        if ($ok) {
-            $msg = $scoresReleased
-                ? 'Parent exam/semester scores are now hidden.'
-                : 'Parent exam/semester scores are now released.';
-            $msg .= ' (' . $configKey . '=' . $nextValue . ')';
-            return redirect()->back()->with('status', $msg);
-        }
-
-        return redirect()->back()->with('error', 'Unable to update the scores release flag.');
-    }
-
-    private function getParentReleaseKey(string $semester): ?string
-    {
-        $norm = strtolower(trim((string) $semester));
-        if ($norm === 'fall') {
-            return 'parent_scores_released_fall';
-        }
-        if ($norm === 'spring') {
-            return 'parent_scores_released_spring';
-        }
-        return null;
-    }
-
-    private function getParentScoresReleasedForSemester(string $semester): bool
-    {
-        $key = $this->getParentReleaseKey($semester);
-        $raw = $key ? $this->configModel->getConfig($key) : null;
-        $raw = (string) ($raw ?? '');
-        return in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'y', 'on'], true);
-    }
-
-    private function ensureParentReleaseKeyExists(string $semester): void
-    {
-        $key = $this->getParentReleaseKey($semester);
-        if (!$key) {
-            return;
-        }
-        if ($this->configModel->getConfigValueByKey($key) === null) {
-            $this->configModel->setConfigValueByKey($key, '0');
-        }
-    }
-
-    public function refreshSemesterScores()
-    {
-        $classSectionId = (int) ($this->request->getPost('class_section_id') ?? 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('error', 'Missing class section.');
-        }
-
-        $requestedSemester = (string) ($this->request->getPost('semester') ?? '');
-        $requestedYear = (string) ($this->request->getPost('school_year') ?? '');
-        $semester = $this->normalizeSemesterInput($requestedSemester) ?? $requestedSemester;
-        if ($semester === '') {
-            $semester = (string) $this->semester;
-        }
-        $schoolYear = trim($requestedYear) !== '' ? trim($requestedYear) : (string) $this->schoolYear;
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId(
-            $classSectionId,
-            $semester,
-            $schoolYear
-        );
-        if (empty($studentTeacherInfo)) {
-            return redirect()->back()->with('error', 'No students found for this class/term.');
-        }
-
-        try {
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-            $this->refreshAttendanceComments($classSectionId, $semester, $schoolYear);
-        } catch (\Throwable $e) {
-            log_message('error', 'refreshSemesterScores failed: ' . $e->getMessage());
-            return redirect()->back()->with('error', 'Refresh failed. Check logs.');
-        }
-
-        return redirect()->back()->with('status', 'Semester scores refreshed for this class/term.');
-    }
-
-    private function refreshAttendanceComments(int $classSectionId, string $semester, string $schoolYear): void
-    {
-        helper('attendance_comment');
-
-        $scoreModel = new SemesterScoreModel();
-        $commentModel = new ScoreCommentModel();
-
-        $scoreRows = $scoreModel
-            ->select(['student_id', 'attendance_score'])
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        if (empty($scoreRows)) {
-            return;
-        }
-
-        $studentIds = array_values(array_unique(array_map(
-            static fn($row) => (int) ($row['student_id'] ?? 0),
-            $scoreRows
-        )));
-        $studentIds = array_values(array_filter($studentIds, static fn($id) => $id > 0));
-        if (empty($studentIds)) {
-            return;
-        }
-
-        $students = $this->studentModel
-            ->select(['id', 'firstname'])
-            ->whereIn('id', $studentIds)
-            ->findAll();
-        $nameMap = [];
-        foreach ($students as $st) {
-            $nameMap[(int)$st['id']] = (string) ($st['firstname'] ?? '');
-        }
-
-        $existing = $commentModel
-            ->where('score_type', 'attendance')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->whereIn('student_id', $studentIds)
-            ->findAll();
-        $existingByStudent = [];
-        foreach ($existing as $row) {
-            $existingByStudent[(int)$row['student_id']] = $row;
-        }
-
-        foreach ($scoreRows as $row) {
-            $sid = (int) ($row['student_id'] ?? 0);
-            if ($sid <= 0) {
-                continue;
-            }
-            $score = isset($row['attendance_score']) ? (float) $row['attendance_score'] : null;
-            if ($score === null) {
-                continue;
-            }
-            $auto = attendance_comment_from_score($score, $nameMap[$sid] ?? '');
-            if ($auto === null) {
-                continue;
-            }
-
-            if (isset($existingByStudent[$sid])) {
-                $commentModel->update($existingByStudent[$sid]['id'], [
-                    'comment' => $auto,
-                ]);
-            } else {
-                $commentModel->insert([
-                    'student_id'       => $sid,
-                    'class_section_id' => $classSectionId,
-                    'score_type'       => 'attendance',
-                    'semester'         => $semester,
-                    'school_year'      => $schoolYear,
-                    'comment'          => $auto,
-                    'commented_by'     => null,
-                    'created_at'       => utc_now(),
-                ]);
-            }
-        }
-    }
-
-    /**
-     * Build grading rows with PTAP and semester scores (business + pk join).
-     *
-     * @param string $semEsc Escaped semester string for SQL
-     * @param string $yrEsc  Escaped school year string for SQL
-     * @param string $schoolYear Raw school year value for filtering student_class
-     * @return array
-     */
-    private function buildGradingRows(string $semEsc, string $yrEsc, string $schoolYear): array
-    {
-        $builder = $this->db->table('student_class sc')
-            ->select([
-                'cs.id                         AS section_pk',
-                'cs.class_section_id           AS section_id',      // BUSINESS id used in URLs
-                'cs.class_id                   AS class_id',        // 13=KG, 1..11=Grade N, 12=Youth
-                'cs.class_section_name',
-                's.id                          AS student_id',
-                's.school_id',
-                's.firstname',
-                's.lastname',
-                'pl.level                    AS placement_level',
-
-                // Prefer business-id match; fall back to pk match
-                'COALESCE(ss_b.ptap_score, ss_p.ptap_score)          AS ss_ptap_score',
-                'COALESCE(ss_b.semester_score, ss_p.semester_score)  AS ss_semester_score',
-                'COALESCE(ss_b.attendance_score, ss_p.attendance_score) AS ss_attendance_score',
-                'COALESCE(ss_b.homework_avg, ss_p.homework_avg)      AS ss_homework_avg',
-                'COALESCE(ss_b.project_avg, ss_p.project_avg)        AS ss_project_avg',
-                'COALESCE(ss_b.quiz_avg, ss_p.quiz_avg)              AS ss_quiz_avg',
-                'COALESCE(ss_b.participation_score, ss_p.participation_score) AS ss_participation_score',
-                'COALESCE(ss_b.midterm_exam_score, ss_p.midterm_exam_score)   AS ss_midterm_exam_score',
-                'COALESCE(ss_b.final_exam_score, ss_p.final_exam_score)       AS ss_final_exam_score',
-                // helpful to debug what matched:
-                'ss_b.class_section_id        AS matched_biz_csid',
-                'ss_p.class_section_id        AS matched_pk_csid'
-            ])
-            ->join('`classSection` cs', 'cs.class_section_id = sc.class_section_id', 'left')
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->join(
-                'placement_levels pl',
-                "pl.student_id = s.id AND pl.school_year = {$yrEsc}",
-                'left'
-            )
-
-            // business-id join
-            ->join(
-                'semester_scores ss_b',
-                "ss_b.student_id = s.id
-             AND ss_b.class_section_id = sc.class_section_id
-             AND LOWER(ss_b.semester) = LOWER(TRIM({$semEsc}))
-             AND ss_b.school_year = {$yrEsc}",
-                'left'
-            )
-            // pk join
-            ->join(
-                'semester_scores ss_p',
-                "ss_p.student_id = s.id
-             AND ss_p.class_section_id = cs.id
-             AND LOWER(ss_p.semester) = LOWER(TRIM({$semEsc}))
-             AND ss_p.school_year = {$yrEsc}",
-                'left'
-            )
-            ->where('sc.school_year', $schoolYear)
-            ->where('s.is_active', 1); // Exclude removed/inactive students
-
-        return $builder
-            ->orderBy('cs.class_id', 'ASC')
-            ->orderBy('cs.class_section_name', 'ASC')
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()->getResultArray();
-    }
-
-    private function calculateAttendanceScoreForStudent(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): ?float
-    {
-        try {
-            $result = $this->attendanceCalculator->calculate($studentId, $semester, $schoolYear, $classSectionId);
-            $score = $result['attendance_score'] ?? null;
-            if ($score === null || $score === '') {
-                return null;
-            }
-            return round((float) $score, 2);
-        } catch (\Throwable $e) {
-            log_message(
-                'error',
-                'GradingController::calculateAttendanceScoreForStudent failed for '
-                . "student {$studentId}: " . $e->getMessage()
-            );
-        }
-        return null;
-    }
-
-    private function normalizeSemesterInput(?string $semester): ?string
-    {
-        if (!is_string($semester)) {
-            return null;
-        }
-        $trimmed = trim($semester);
-        return $trimmed === '' ? null : $trimmed;
-    }
-
-    private function resolveSemesterSelection(?string $requestedSemester, array $semesterOptions, ?string $fallbackSemester): string
-    {
-        if ($requestedSemester !== null) {
-            foreach ($semesterOptions as $option) {
-                if (strcasecmp($option, $requestedSemester) === 0) {
-                    return $option;
-                }
-            }
-            return $requestedSemester;
-        }
-        if ($fallbackSemester !== null && $fallbackSemester !== '') {
-            foreach ($semesterOptions as $option) {
-                if (strcasecmp($option, $fallbackSemester) === 0) {
-                    return $option;
-                }
-            }
-            return $fallbackSemester;
-        }
-        return $semesterOptions[0] ?? '';
-    }
-
-    private function getSemestersForSchoolYear(string $schoolYear, ?string $fallbackSemester = null): array
-    {
-        $rows = $this->db->table('semester_scores')
-            ->select('DISTINCT semester', false)
-            ->where('semester IS NOT NULL', null, false)
-            ->where('semester != ""', null, false)
-            ->where('school_year', $schoolYear)
-            ->orderBy('semester', 'ASC')
-            ->get()
-            ->getResultArray();
-
-        $semesters = [];
-        foreach ($rows as $row) {
-            $value = trim((string) ($row['semester'] ?? ''));
-            if ($value === '') continue;
-            $semesters[] = $value;
-        }
-
-        if (empty($semesters)) {
-            $semesters = ['Fall', 'Spring'];
-        }
-
-        if ($fallbackSemester !== null && $fallbackSemester !== '' && !in_array($fallbackSemester, $semesters, true)) {
-            array_unshift($semesters, $fallbackSemester);
-        }
-
-        return array_values(array_unique($semesters));
-    }
-
-    private function getSchoolYearsForScores(?string $fallback = null): array
-    {
-        $schoolYears = [];
-        try {
-            $rows = $this->db->table('semester_scores')
-                ->select('DISTINCT school_year', false)
-                ->where('school_year IS NOT NULL', null, false)
-                ->where('school_year != ""', null, false)
-                ->orderBy('school_year', 'DESC')
-                ->get()
-                ->getResultArray();
-            foreach ($rows as $row) {
-                $val = (string)($row['school_year'] ?? '');
-                if ($val !== '') $schoolYears[] = $val;
-            }
-        } catch (\Throwable $e) {
-        }
-        try {
-            $rows2 = $this->db->table('student_class')
-                ->select('DISTINCT school_year', false)
-                ->where('school_year IS NOT NULL', null, false)
-                ->where('school_year != ""', null, false)
-                ->orderBy('school_year', 'DESC')
-                ->get()
-                ->getResultArray();
-            foreach ($rows2 as $row) {
-                $val = (string)($row['school_year'] ?? '');
-                if ($val !== '' && !in_array($val, $schoolYears, true)) $schoolYears[] = $val;
-            }
-        } catch (\Throwable $e) {
-        }
-        if ($fallback && !in_array($fallback, $schoolYears, true)) {
-            array_unshift($schoolYears, $fallback);
-        }
-        return array_values(array_unique($schoolYears));
-    }
-
-    private function fetchBelowSixtyRows(string $schoolYear, string $semester): array
-    {
-        $semesterKey = strtolower(trim($semester));
-        $rows = $this->db->table('semester_scores ss')
-            ->select([
-                's.id AS student_id',
-                's.school_id',
-                's.firstname',
-                's.lastname',
-                'cs.class_section_name',
-                'ss.homework_avg',
-                'ss.project_avg',
-                'ss.participation_score',
-                'COALESCE(ss.test_avg, ss.quiz_avg) AS test_avg',
-                'ss.ptap_score',
-                'ss.attendance_score',
-                'ss.midterm_exam_score',
-                'ss.final_exam_score',
-                'ss.semester_score',
-            ])
-            ->join('students s', 's.id = ss.student_id', 'inner')
-            ->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
-            ->where('s.is_active', 1)
-            ->where('ss.school_year', $schoolYear)
-            ->where("LOWER(TRIM(ss.semester))", $semesterKey)
-            ->where('ss.semester_score IS NOT NULL', null, false)
-            ->where('ss.semester_score <', 60)
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()
-            ->getResultArray();
-
-        if (empty($rows)) {
-            return [];
-        }
-
-        $studentIds = array_values(array_unique(array_map(
-            static fn($r) => (int)($r['student_id'] ?? 0),
-            $rows
-        )));
-        $studentIds = array_values(array_filter($studentIds, static fn($id) => $id > 0));
-
-        $commentMap = [];
-        if (!empty($studentIds)) {
-            $commentRows = $this->db->table('score_comments')
-                ->select('student_id, comment, created_at')
-                ->where('score_type', 'general')
-                ->where('school_year', $schoolYear)
-                ->where("LOWER(TRIM(semester))", $semesterKey)
-                ->whereIn('student_id', $studentIds)
-                ->orderBy('created_at', 'DESC')
-                ->get()
-                ->getResultArray();
-            foreach ($commentRows as $row) {
-                $sid = (int)($row['student_id'] ?? 0);
-                if ($sid > 0 && !isset($commentMap[$sid])) {
-                    $commentMap[$sid] = (string)($row['comment'] ?? '');
-                }
-            }
-        }
-
-        $statusMap = [];
-        if (!empty($studentIds)) {
-            $flagRows = $this->db->table('current_flag')
-                ->select('student_id, flag_state')
-                ->where('flag', 'grade')
-                ->where('school_year', $schoolYear)
-                ->where("LOWER(TRIM(semester))", $semesterKey)
-                ->whereIn('student_id', $studentIds)
-                ->get()
-                ->getResultArray();
-            foreach ($flagRows as $row) {
-                $sid = (int)($row['student_id'] ?? 0);
-                if ($sid <= 0) continue;
-                $statusMap[$sid] = (string)($row['flag_state'] ?? '');
-            }
-        }
-
-        foreach ($rows as &$row) {
-            $sid = (int)($row['student_id'] ?? 0);
-            $row['comment'] = $commentMap[$sid] ?? '';
-            $flagState = strtolower(trim((string)($statusMap[$sid] ?? '')));
-            $row['status'] = ($flagState === 'closed' || $flagState === 'canceled') ? 'Closed' : 'Open';
-        }
-        unset($row);
-
-        return $rows;
-    }
-
-    private function fetchBelowSixtyEmailRow(int $studentId, string $schoolYear, string $semester): array
-    {
-        $semesterKey = strtolower(trim($semester));
-        $row = $this->db->table('semester_scores ss')
-            ->select([
-                's.id AS student_id',
-                's.firstname',
-                's.lastname',
-                'cs.class_section_name',
-                'ss.homework_avg',
-                'ss.project_avg',
-                'ss.participation_score',
-                'COALESCE(ss.test_avg, ss.quiz_avg) AS test_avg',
-                'ss.ptap_score',
-                'ss.attendance_score',
-                'ss.midterm_exam_score',
-                'ss.semester_score',
-            ])
-            ->join('students s', 's.id = ss.student_id', 'inner')
-            ->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
-            ->where('ss.school_year', $schoolYear)
-            ->where('ss.student_id', $studentId)
-            ->where('s.is_active', 1)
-            ->where("LOWER(TRIM(ss.semester))", $semesterKey)
-            ->get()
-            ->getRowArray();
-
-        if (!$row) return [];
-
-        $commentRow = $this->db->table('score_comments')
-            ->select('comment')
-            ->where('score_type', 'general')
-            ->where('school_year', $schoolYear)
-            ->where("LOWER(TRIM(semester))", $semesterKey)
-            ->where('student_id', $studentId)
-            ->orderBy('created_at', 'DESC')
-            ->get()
-            ->getRowArray();
-        $row['comment'] = (string)($commentRow['comment'] ?? '');
-
-        return $row;
-    }
-
-    private function userHasMenuUrl(string $needle): bool
-    {
-        $needle = strtolower(trim($needle));
-        if ($needle === '') {
-            return false;
-        }
-
-        $rawRole = session()->get('role');
-        $roles = is_array($rawRole) ? $rawRole : [$rawRole ?? 'guest'];
-        $roles = array_values(array_filter(array_map('strval', $roles)));
-        if (empty($roles)) {
-            return false;
-        }
-
-        $service = new NavbarService();
-        $menu = $service->getMenuForRoles($roles);
-        if (empty($menu)) {
-            return false;
-        }
-
-        $normalize = static function (string $url) use ($needle): string {
-            $url = strtolower(trim($url));
-            if ($url === '') return '';
-            $url = preg_replace('#^https?://[^/]+/#i', '', $url);
-            $url = ltrim($url, '/');
-            return $url;
-        };
-
-        $target = $normalize($needle);
-        $stack = $menu;
-        while (!empty($stack)) {
-            $node = array_shift($stack);
-            if (!empty($node['url'])) {
-                $url = $normalize((string)$node['url']);
-                if ($url !== '' && $url === $target) {
-                    return true;
-                }
-            }
-            if (!empty($node['children']) && is_array($node['children'])) {
-                foreach ($node['children'] as $child) {
-                    $stack[] = $child;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private function fetchBelowSixtyParentName(int $studentId): string
-    {
-        $parentName = 'Parent/Guardian';
-        try {
-            $rows = $this->db->query(
-                "SELECT u.firstname, u.lastname
-                   FROM family_students fs
-                   JOIN family_guardians fg ON fg.family_id = fs.family_id
-                   JOIN users u ON u.id = fg.user_id
-                  WHERE fs.student_id = ?
-                  ORDER BY fg.is_primary DESC, u.lastname, u.firstname
-                  LIMIT 1",
-                [$studentId]
-            )->getResultArray();
-            if (!empty($rows[0])) {
-                $candidate = trim((string)($rows[0]['firstname'] ?? '') . ' ' . (string)($rows[0]['lastname'] ?? ''));
-                if ($candidate !== '') {
-                    $parentName = $candidate;
-                }
-            }
-        } catch (\Throwable $e) {
-        }
-        return $parentName;
-    }
-
-    private function buildBelowSixtySubject(string $studentName, string $semester, string $schoolYear): string
-    {
-        $subject = 'Student Performance Alert';
-        if ($studentName !== '') {
-            $subject .= ' — ' . $studentName;
-        }
-        if ($semester !== '' || $schoolYear !== '') {
-            $subject .= ' (' . trim($semester . ' ' . $schoolYear) . ')';
-        }
-        return $subject;
-    }
-
-    private function fetchBelowSixtyMeetingContext(int $studentId, string $schoolYear, string $semester): array
-    {
-        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
-        if (empty($row)) {
-            return [];
-        }
-
-        $db = $this->db;
-        $parentName = 'Parent/Guardian';
-        $parentUserId = null;
-        try {
-            $pRows = $db->query(
-                "SELECT u.id AS user_id, u.firstname, u.lastname
-                   FROM family_students fs
-                   JOIN family_guardians fg ON fg.family_id = fs.family_id
-                   JOIN users u ON u.id = fg.user_id
-                  WHERE fs.student_id = ?
-                  ORDER BY fg.is_primary DESC, u.lastname, u.firstname
-                  LIMIT 1",
-                [$studentId]
-            )->getResultArray();
-            if (!empty($pRows[0])) {
-                $parentUserId = (int)($pRows[0]['user_id'] ?? 0) ?: null;
-                $parentName = trim((string)($pRows[0]['firstname'] ?? '') . ' ' . (string)($pRows[0]['lastname'] ?? ''));
-                if ($parentName === '') {
-                    $parentName = 'Parent/Guardian';
-                }
-            }
-        } catch (\Throwable $e) {
-        }
-
-        // Legacy fallback: students.parent_id
-        if ($parentUserId === null) {
-            try {
-                $srow = $db->query(
-                    "SELECT s.parent_id, u.firstname, u.lastname
-                       FROM students s
-                       LEFT JOIN users u ON u.id = s.parent_id
-                      WHERE s.id = ?
-                      LIMIT 1",
-                    [$studentId]
-                )->getRowArray();
-                if (!empty($srow)) {
-                    $parentUserId = (int)($srow['parent_id'] ?? 0) ?: null;
-                    $fallbackName = trim((string)($srow['firstname'] ?? '') . ' ' . (string)($srow['lastname'] ?? ''));
-                    if ($fallbackName !== '') {
-                        $parentName = $fallbackName;
-                    }
-                }
-            } catch (\Throwable $e) {
-            }
-        }
-
-        $studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
-        return [
-            'student_name' => $studentName !== '' ? $studentName : 'Student',
-            'parent_name' => $parentName,
-            'parent_user_id' => $parentUserId,
-            'class_section_name' => (string)($row['class_section_name'] ?? ''),
-        ];
-    }
-
-
-    /**
-     * Parses a classSection name into a (classId, label) pair compatible with your Attendance view.
-     * - KG   -> (0, 'KG')
-     * - Youth-> (13, 'Youth')
-     * - Grade N -> (N, 'Grade N')
-     * Fallback: tries to extract first number; else returns (99, original).
-     */
-    private function parseClassIdFromSectionName(string $name): array
-    {
-        $n = trim($name);
-
-        // Common patterns used in your data
-        if (preg_match('/\bKG\b/i', $n)) {
-            return [0, 'KG'];
-        }
-        if (preg_match('/\bYouth\b/i', $n)) {
-            return [13, 'Youth'];
-        }
-        if (preg_match('/Grade\s*(\d+)/i', $n, $m)) {
-            $g = (int)$m[1];
-            return [$g, 'Grade ' . $g];
-        }
-
-        // Fallback: any number present becomes the grade id
-        if (preg_match('/(\d+)/', $n, $m2)) {
-            $g = (int)$m2[1];
-            return [$g, 'Grade ' . $g];
-        }
-
-        // Last fallback
-        return [99, $n];
-    }
-
-
-
-
-    /**
-     * Resolve class_section_id for a student in the current term.
-     */
-    private function resolveClassSectionIdForStudent(int $studentId): int
-    {
-        $row = $this->db->table('student_class')
-            ->select('class_section_id')
-            ->where('student_id', $studentId)
-            ->where('school_year', $this->schoolYear)
-            ->where('semester', $this->semester)
-            ->get()->getRow();
-
-        return $row ? (int)$row->class_section_id : 0;
-    }
-
-    /** Simple slugifier used as array keys for tabs */
-    private function slugify(string $s): string
-    {
-        $s = strtolower($s);
-        $s = preg_replace('/[^a-z0-9]+/i', '-', $s);
-        return trim($s, '-');
-    }
-
-    /** Rank: KG first, numbers ascending, Youth last */
-    private function rankOf(string $name): int
-    {
-        $k = strtolower(trim($name));
-        if ($k === 'kg' || $k === 'kindergarten') return -100;
-        if ($k === 'youth') return 100000;
-        if (preg_match('/\d+/', $k, $m)) return (int)$m[0];
-        return 50000;
-    }
-
-
-    public function getScoreComment()
-    {
-        // Get all students for the current semester and school year
-        $studentClassEntries = $this->studentClassModel
-            ->where('semester', $this->semester)
-            ->where('school_year', $this->schoolYear)
-            ->findAll();
-
-        // Group student IDs
-        $studentIds = array_map(fn($entry) => $entry['student_id'], $studentClassEntries);
-
-        // Fetch all scores and comments for the students
-        $scoresAndComments = $this->getAllScoresAndComments($studentIds, $this->semester, $this->schoolYear);
-
-        return $scoresAndComments;
-    }
-
-    /**
-     * Fetch all scores and comments for a list of students based on semester and school year.
-     *
-     * @param array $studentIds List of student IDs.
-     * @param string $semester Current semester (e.g., 'fall', 'spring').
-     * @param string $schoolYear Current school year (e.g., '2025-2026').
-     * @return array
-     */
-    private function getAllScoresAndComments($studentIds, $semester, $schoolYear)
-    {
-        // Validate input parameters
-        if (empty($studentIds) || !is_array($studentIds)) {
-            return [];
-        }
-
-        if (empty($this->semester) || empty($this->schoolYear)) {
-            throw new \InvalidArgumentException('Semester and school year must be provided');
-        }
-
-        // Initialize models
-        $models = [
-            'final_exam' => new FinalExamModel(),
-            'homework' => new HomeworkModel(),
-            'midterm' => new MidtermExamModel(),
-            'project' => new ProjectModel(),
-            'quiz' => new QuizModel(),
-            'comments' => new ScoreCommentModel(),
-            'semester_scores' => new SemesterScoreModel(),
-            'student' => new StudentModel(),
-            'student_class' => new StudentClassModel(),
-            'teacher_class' => new TeacherClassModel(),
-            'config' => new ConfigurationModel(),
-            'attendance' => new AttendanceRecordModel()
-        ];
-
-        // Get semester days configuration
-        $semesterKey = strtolower($semester) === 'fall' ? 'total_semester1_days' : 'total_semester2_days';
-        $totalSemesterDays = $models['config']->getConfig($semesterKey) ?? 0;
-
-        // Common query conditions
-        $conditions = [
-            'semester' => $this->semester,
-            'school_year' => $this->schoolYear
-        ];
-
-        // Fetch all student data first
-        $students = $models['student']->whereIn('id', $studentIds)
-            ->where('school_year', $this->schoolYear)
-            ->findAll();
-
-        if (empty($students)) {
-            return [];
-        }
-
-        // Initialize result array with student data
-        $allScores = [];
-        foreach ($students as $student) {
-            $className = $models['student_class']->getClassSectionsByStudentId($student['id'], $this->schoolYear);
-            $updatedBy = $models['teacher_class']->getTeacherIdByClassSection($className, $this->semester, $this->schoolYear);
-
-            $allScores[$student['id']] = [
-                'school_id' => $student['school_id'],
-                'firstname' => $student['firstname'],
-                'lastname' => $student['lastname'],
-                'class_name' => $className,
-                //'teacherId' => $updatedBy,
-                'comments' => [] // Initialize empty comments array
-            ];
-        }
-
-        // Fetch and process attendance data
-        foreach ($studentIds as $studentId) {
-            if (!isset($allScores[$studentId])) continue;
-
-            $absences = $models['attendance']->getTotalAbsences($studentId, $this->semester, $this->schoolYear);
-            $attendance = min((($totalSemesterDays - $absences + 1) / $totalSemesterDays) * 100, 100);
-
-            $allScores[$studentId]['attendance'] = [
-                'score' => round($attendance, 2),
-                'absences' => $absences,
-                'total_days' => $totalSemesterDays
-            ];
-        }
-
-        // Fetch and process all score types
-        $scoreTypes = [
-            'final_exam' => $models['final_exam'],
-            'homework' => $models['homework'],
-            'midterm' => $models['midterm'],
-            'project' => $models['project'],
-            'quiz' => $models['quiz'],
-            'semester_score' => $models['semester_scores']
-        ];
-
-        foreach ($scoreTypes as $type => $model) {
-            $scores = $model->whereIn('student_id', $studentIds)
-                ->where($conditions)
-                ->findAll();
-
-            foreach ($scores as $score) {
-                if ($type === 'semester_score') {
-                    $allScores[$score['student_id']][$type] = [
-                        'homework_avg' => $score['homework_avg'],
-                        'quiz_avg' => $score['quiz_avg'],
-                        'project_avg' => $score['project_avg'],
-                        'midterm_exam_score' => $score['midterm_exam_score'],
-                        'final_exam_score' => $score['final_exam_score'],
-                        'attendance_score' => $score['attendance_score'],
-                        'participation_score' => $score['participation_score'],
-                        'ptap_score' => $score['ptap_score'],
-                        'test_avg' => $score['test_avg'],
-                        'semester_score' => $score['semester_score'],
-                        'semester' => $score['semester'],
-                        'school_year' => $score['school_year']
-                    ];
-                } else {
-                    $allScores[$score['student_id']][$type] = $score;
-                }
-            }
-        }
-
-        // Fetch and process comments
-        $comments = $models['comments']->whereIn('student_id', $studentIds)
-            ->where($conditions)
-            ->findAll();
-
-        foreach ($comments as $comment) {
-            $allScores[$comment['student_id']]['comments'][] = $comment;
-        }
-
-        return $allScores;
-    }
-}
diff --git a/app/Http/Controllers/old/HomeworkController.php b/app/Http/Controllers/old/HomeworkController.php
deleted file mode 100644
index 47594e77..00000000
--- a/app/Http/Controllers/old/HomeworkController.php
+++ /dev/null
@@ -1,656 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\HomeworkModel;
-use App\Models\StudentModel;
-use App\Models\StudentClassModel;
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\ConfigurationModel;
-use App\Models\UserModel;
-use RuntimeException;
-use App\Services\SemesterScoreService;
-use Config\Services;
-use App\Controllers\View\GradingController;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-class HomeworkController extends Controller
-{
-    protected $db;
-    protected $semesterScoreService;
-    protected $configModel;
-    protected $homeworkModel;
-    protected $userModel;
-    protected $schoolYear;
-    protected $semester;
-    protected $studentClassModel;
-    protected $studentModel;
-    protected $teacherClassModel;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->homeworkModel = new HomeworkModel();
-        $this->userModel = new UserModel();
-        $this->studentClassModel = new StudentClassModel();
-        $this->studentModel      = new StudentModel();
-        $this->configModel = new ConfigurationModel();
-
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-
-        // Log the service initialization
-        log_message('debug', 'Initializing SemesterScoreService');
-
-        //$this->semesterScoreService = Services::SemesterScoreService();
-        $this->semesterScoreService = service('semesterScoreService');
-        // $this->semesterScoreService = \Config\Services::semesterScoreService();   
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-
-        // Check if the service is null
-        if ($this->semesterScoreService === null) {
-            log_message('error', 'SemesterScoreService is null');
-        }
-    }
-
-    public function updateHomeworkScores(array $scores = null, int $updatedBy = null, int $classSectionId = null)
-    {
-        $scores = $this->request->getPost('scores');
-        $semester = $this->request->getPost('semester') ?? $this->semester;
-        $schoolYear = $this->request->getPost('school_year') ?? $this->schoolYear;
-
-        if ($updatedBy === null) {
-            $updatedBy = session()->get('user_id');
-        }
-        $classSectionId = $this->request->getPost('class_section_id') ?? session()->get('class_section_id');
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-        $studentIds = is_array($scores) ? array_keys($scores) : array_keys((array) $missingOk);
-        $indexSet = [];
-        if (is_array($scores)) {
-            foreach ($scores as $studentId => $hwData) {
-                if (!is_array($hwData)) {
-                    continue;
-                }
-                foreach ($hwData as $index => $score) {
-                    if (is_numeric($index)) {
-                        $indexSet[(int)$index] = true;
-                    }
-                }
-            }
-        }
-        $checkedItems = [];
-        if (is_array($missingOk)) {
-            foreach ($missingOk as $studentId => $indexes) {
-                if (!is_array($indexes)) {
-                    continue;
-                }
-                foreach ($indexes as $index => $flag) {
-                    if (!is_numeric($index)) {
-                        continue;
-                    }
-                    $checkedItems[] = [
-                        'student_id' => (int) $studentId,
-                        'item_index' => (int) $index,
-                    ];
-                }
-            }
-        }
-        $this->missingScoreOverrideModel->replaceOverrides(
-            $classSectionId,
-            (string) $semester,
-            (string) $schoolYear,
-            'homework',
-            $studentIds,
-            array_keys($indexSet),
-            $checkedItems,
-            $updatedBy
-        );
-
-        if (is_array($scores)) {
-            foreach ($scores as $studentId => $hwData) {
-                if (!is_numeric($studentId)) continue;
-
-                $student = $this->studentModel->find($studentId);
-                if (!$student) continue;
-
-                foreach ($hwData as $index => $score) {
-                    $rawScore = $score ?? null;
-                    $isBlank = $rawScore === null || (is_string($rawScore) && trim($rawScore) === '');
-                    $normalizedScore = (!$isBlank && is_numeric($rawScore)) ? (float) $rawScore : null;
-
-                    // STEP 1: Always fetch the existing record
-                    $existing = $this->homeworkModel->where([
-                        'student_id'       => $studentId,
-                        'homework_index'   => $index,
-                        'class_section_id' => $classSectionId,
-                        //'teacher_id'       => $updatedBy,
-                        'semester'         => $semester,
-                        'school_year'      => $schoolYear,
-                    ])->first();
-
-                    // STEP 2: Save numeric score (blank -> null)
-                    $data = [
-                        'student_id'       => $studentId,
-                        'school_id'        => $student['school_id'] ?? '',
-                        'class_section_id' => $classSectionId,
-                        'updated_by'       => $updatedBy,
-                        'homework_index'   => $index,
-                        'score'            => $normalizedScore,
-                        'semester'         => $semester,
-                        'school_year'      => $schoolYear,
-                        'updated_at'       => utc_now(),
-                    ];
-
-                    if ($isBlank) {
-                        if ($existing) {
-                            $this->homeworkModel->update($existing['id'], $data);
-                            log_message('debug', "Updated homework ID {$existing['id']} with score null");
-                        } else {
-                            $data['created_at'] = utc_now();
-                            $this->homeworkModel->insert($data);
-                            log_message('debug', "Inserted blank homework for student $studentId index $index");
-                        }
-                        continue;
-                    }
-
-                    if ($existing) {
-                        $this->homeworkModel->update($existing['id'], $data);
-                        log_message('debug', "Updated homework ID {$existing['id']} with score {$normalizedScore}");
-                    } else {
-                        $data['created_at'] = utc_now();
-                        $this->homeworkModel->insert($data);
-                        log_message('debug', "Inserted score for student $studentId index $index");
-                    }
-                }
-            }
-        }
-        $studentUserInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-
-        // Call the updateScoresForStudents method
-        try {
-            $this->semesterScoreService->updateScoresForStudents($studentUserInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-
-        return redirect()->to(base_url('/teacher/addHomework'))->with('status', 'Homework scores updated successfully.');
-    }
-
-
-    public function addNextHomeworkColumn()
-    {
-        $updatedBy = session()->get('user_id');
-        $classSectionId = session()->get('class_section_id');
-        $selectedSemester = $this->getSelectedSemester();
-        $normalized = $this->normalizeSemesterSelection($selectedSemester);
-        $semesterLabel = $normalized !== '' ? ucfirst($normalized) : $selectedSemester;
-
-        // Step 1: Get the highest existing homework_index
-        $existingIndexes = $this->homeworkModel
-            ->select('homework_index')
-            ->where('class_section_id', $classSectionId)
-            //->where('teacher_id', $updatedBy)
-            ->whereIn('semester', $this->getSemesterVariants($semesterLabel))
-            ->where('school_year', $this->schoolYear)
-            ->groupBy('homework_index')
-            ->orderBy('homework_index', 'DESC')
-            ->findAll();
-
-        $maxIndex = 0;
-        foreach ($existingIndexes as $row) {
-            if (isset($row['homework_index']) && is_numeric($row['homework_index'])) {
-                $maxIndex = max($maxIndex, (int)$row['homework_index']);
-            }
-        }
-
-        $nextIndex = $maxIndex + 1;
-
-        // Step 2: Get all students in the class
-        $students = $this->studentClassModel
-            ->where('class_section_id', $classSectionId)
-            ->findAll();
-
-        // Step 3: Insert a new homework row for each student if not already exists
-        $firstInsertedId = null;
-        foreach ($students as $i => $student) {
-            $studentId = $student['student_id'];
-
-            // Check if record already exists
-            $existing = $this->homeworkModel
-                ->where('student_id', $studentId)
-                ->where('homework_index', $nextIndex)
-                ->where('class_section_id', $classSectionId)
-                //->where('teacher_id', $updatedBy)
-                ->whereIn('semester', $this->getSemesterVariants($semesterLabel))
-                ->where('school_year', $this->schoolYear)
-                ->first();
-
-            if ($existing) continue;
-
-            $insertData = [
-                'student_id'       => $studentId,
-                'school_id'        => '', // Optional: populate if needed
-                'class_section_id' => $classSectionId,
-                'updated_by'       => $updatedBy,
-                'homework_index'   => $nextIndex,
-                'score'            => null,
-                'semester'         => $semesterLabel,
-                'school_year'      => $this->schoolYear,
-                'created_at'       => utc_now(),
-                'updated_at'       => utc_now()
-            ];
-
-            $id = $this->homeworkModel->insert($insertData, true);
-            if ($i === 0) {
-                $firstInsertedId = $id;
-            }
-        }
-
-        // Step 4: Return index and ID to frontend
-        return $this->response->setJSON([
-            'status' => 'success',
-            'homework_index' => $nextIndex,
-            'new_homework_id' => $firstInsertedId
-        ]);
-    }
-
-
-    public function showHomework()
-    {
-        $updatedBy = session()->get('user_id');
-        $classSectionId = $this->getClassSectionIdForTeacher($updatedBy);
-        if (!$classSectionId) {
-            return redirect()->back()->with('status', 'No class section found for the current teacher.');
-        }
-
-        session()->set('class_section_id', $classSectionId);
-
-        $semester = $this->getSelectedSemester();
-        $homeworkHeaders = $this->getHomeworkHeaders($classSectionId, $semester, $this->schoolYear);
-        if (empty($homeworkHeaders)) {
-            $homeworkHeaders = [1];
-        }
-        $students = $this->getStudentsWithHomeworkScores(
-            $classSectionId,
-            $homeworkHeaders,
-            $semester,
-            $this->schoolYear
-        );
-        $missingOkMap = $this->missingScoreOverrideModel->getOverridesMap($classSectionId, $semester, $this->schoolYear, 'homework');
-
-        return view('teacher/add_homework', [
-            'students'         => $students,
-            'homeworkHeaders'  => $homeworkHeaders,
-            'semester'         => $semester,
-            'schoolYear'       => $this->schoolYear,
-            'class_section_id' => $classSectionId,
-            'missingOkMap'     => $missingOkMap,
-        ]);
-    }
-
-    // In your GradingController (or the controller that owns this action)
-    public function showHomeworkMngt()
-    {
-        // Accept POST first, then GET (query string), then session fallback
-        $incomingId = $this->request->getPost('class_section_id');
-        if (!$incomingId) {
-            $incomingId = $this->request->getGet('class_section_id');
-        }
-
-        $classSectionId = (int) ($incomingId ?: (session()->get('class_section_id') ?? 0));
-
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'No class section found for the current teacher or selection.');
-        }
-        $updatedBy = (int) (session()->get('user_id') ?? 0);
-
-        $semesterParam = $this->request->getPost('semester')
-            ?? $this->request->getGet('semester')
-            ?? $this->request->getGet('filter');
-        $normalizedSemester = $this->normalizeSemesterSelection($semesterParam);
-        if ($normalizedSemester !== '') {
-            $label = ucfirst($normalizedSemester);
-            $session = session();
-            $session->set('teacher_scores_selected_semester', $label);
-            $session->set('semester', $label);
-        }
-
-        $schoolYearParam = $this->request->getPost('school_year') ?? $this->request->getGet('school_year');
-        $schoolYear = $this->normalizeSchoolYear($schoolYearParam) ?? $this->schoolYear;
-        /*
-    // OPTIONAL (recommended): ensure the classSectionId belongs to this teacher for the active term
-    $updatedBy = (int) (session()->get('user_id') ?? 0);
-    if ($updatedBy > 0) {
-        // If you have a TeacherClassModel with new schema (position = 'main' or 'ta'):
-        $isOwned = $this->teacherClassModel
-            ->where('teacher_id', $updatedBy)
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $this->schoolYear)
-            ->where('semester', $this->semester)
-            ->countAllResults() > 0;
-
-        if (!$isOwned) {
-            return redirect()->back()->with('status', 'You do not have access to that class section.');
-        }
-    }
-*/
-        // Persist chosen class section in the session
-        session()->set('class_section_id', $classSectionId);
-
-        // Load data for the view
-        $semester = $this->getSelectedSemester();
-        $homeworkScores  = $this->getHomeworkScoresByStudent($classSectionId, $semester, $schoolYear);
-        $students        = $this->getStudentsByClassSectionAndYear($classSectionId, $schoolYear);
-        $homeworkHeaders = $this->getHomeworkHeaders($classSectionId, $semester, $schoolYear);
-        $scoresLocked    = $this->isScoresLocked($classSectionId, $semester, $schoolYear);
-
-        // Render
-        return view('grading/homework', [
-            'homeworkScores'  => $homeworkScores,
-            'students'        => $students,
-            'semester'        => $semester,
-            'schoolYear'      => $schoolYear,
-            'homeworkHeaders' => $homeworkHeaders,
-            'classSectionId'  => $classSectionId,
-            'hasHomeworkCols' => !empty($homeworkHeaders),
-            'isManagement'    => true,
-            'scoresLocked'    => $scoresLocked,
-        ]);
-    }
-
-
-    public function updateHomework()
-    {
-        $scores       = $this->request->getPost('scores');
-        $studentIds   = $this->request->getPost('student_ids');
-        $semester     = $this->request->getPost('semester') ?? $this->getSelectedSemester();
-        $schoolYear   = $this->request->getPost('school_year') ?? $this->schoolYear;
-
-        $updatedBy = $this->request->getPost('teacher_id') ?? session()->get('user_id');
-        $classSectionId = $this->request->getPost('class_section_id') ?? session()->get('class_section_id'); // persisted in showHomeworkMngt
-        $classSectionIdInt = (int) ($classSectionId ?? 0);
-        if ($classSectionIdInt > 0 && $this->isScoresLocked($classSectionIdInt, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if ($scores && $studentIds && $semester && $schoolYear && $classSectionId) {
-            $this->updateHomeworkScores($scores, $updatedBy, $classSectionId);
-            session()->setFlashdata('status', 'Homework scores updated successfully.');
-
-            // ⬇️ Directly call the method and return its view
-            return $this->showHomeworkMngt($updatedBy);
-        }
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        return redirect()->back()->with('status', 'Failed to update scores.');
-    }
-
-    private function isScoresLocked(int $classSectionId, string $semester, string $schoolYear): bool
-    {
-        return $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-    }
-
-    // ──────────────── Helpers ────────────────
-
-    private function saveHomeworkScores(array $scores, array $studentIds, string $semester, string $schoolYear, int $updatedBy, int $classSectionId)
-    {
-        $now = utc_now();
-
-        foreach ($studentIds as $studentId) {
-            if (!isset($scores[$studentId])) {
-                continue;
-            }
-
-            foreach ($scores[$studentId] as $index => $score) {
-                $isBlank = $score === null || (is_string($score) && trim($score) === '');
-
-                // Check if the record exists
-                $existing = $this->homeworkModel
-                    ->where('student_id', $studentId)
-                    ->where('homework_index', $index)
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->where('class_section_id', $classSectionId)
-                    //->where('teacher_id', $updatedBy)
-                    ->first();
-
-                if ($isBlank) {
-                    if ($existing) {
-                        $this->homeworkModel->update($existing['id'], [
-                            'score'      => null,
-                            'updated_by' => $updatedBy,
-                            'updated_at' => $now,
-                        ]);
-                    } else {
-                        $this->homeworkModel->insert([
-                            'student_id'       => $studentId,
-                            'class_section_id' => $classSectionId,
-                            'updated_by'       => $updatedBy,
-                            'homework_index'   => $index,
-                            'score'            => null,
-                            'semester'         => $semester,
-                            'school_year'      => $schoolYear,
-                            'created_at'       => $now,
-                            'updated_at'       => $now,
-                        ]);
-                    }
-                    continue;
-                }
-
-                $data = [
-                    'student_id'       => $studentId,
-                    'class_section_id' => $classSectionId,
-                    'updated_by'       => $updatedBy,
-                    'homework_index'   => $index,
-                    'score'            => is_numeric($score) ? floatval($score) : null,
-                    'semester'         => $semester,
-                    'school_year'      => $schoolYear,
-                    'updated_at'       => $now,
-                ];
-
-                if ($existing) {
-                    $this->homeworkModel->update($existing['id'], $data);
-                } else {
-                    $data['created_at'] = $now;
-                    $data['school_id'] = ''; // Set if needed
-                    $this->homeworkModel->insert($data);
-                }
-            }
-        }
-    }
-
-    private function getStudentsByClassSectionAndYear($classSectionId, $schoolYear)
-    {
-        // Step 1: Get student IDs from student_class table
-        $studentClassRows = $this->studentClassModel
-            ->select('student_id')
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $studentIds = array_column($studentClassRows, 'student_id');
-
-        if (empty($studentIds)) {
-            return []; // No students found
-        }
-
-        // Step 2: Get student data from students table
-        $students = $this->studentModel
-            ->whereIn('id', $studentIds)
-            ->where('is_active', 1)
-            ->orderBy('lastname', 'ASC')
-            ->findAll();
-
-        return $students;
-    }
-
-    private function getClassSectionIdForTeacher($updatedBy)
-    {
-        $class = $this->teacherClassModel->where('teacher_id', $updatedBy)->first();
-        return $class['class_section_id'] ?? null;
-    }
-
-
-    private function getHomeworkScoresByStudent($classSectionId, $semester, $schoolYear)
-    {
-        $semVariants = $this->getSemesterVariants($semester);
-        $rows = $this->homeworkModel
-            ->select('student_id, homework_index, score')
-            ->where('class_section_id', $classSectionId)
-            ->whereIn('semester', $semVariants)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $studentScores = [];
-        foreach ($rows as $row) {
-            $studentId = $row['student_id'];
-            $index = $row['homework_index'];
-            $score = $row['score'];
-
-            $studentScores[$studentId]['scores'][$index] = $score;
-        }
-
-        return $studentScores;
-    }
-
-    private function getStudentsWithHomeworkScores($classSectionId, $homeworkHeaders, $semester, $schoolYear)
-    {
-        $semVariants = $this->getSemesterVariants($semester);
-        $studentClasses = $this->studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
-        $students = [];
-
-        foreach ($studentClasses as $sc) {
-            $student = $this->studentModel
-                ->where('id', $sc['student_id'])
-                ->where('is_active', 1)
-                ->first();
-            if (!$student) continue;
-
-            $scores = [];
-                foreach ($homeworkHeaders as $ids) {
-                    $entry = $this->homeworkModel->where('homework_index', $ids)
-                        ->where('student_id', $sc['student_id'])
-                        ->where('class_section_id', $classSectionId)
-                        ->whereIn('semester', $semVariants)
-                        ->where('school_year', $schoolYear)
-                        ->first();
-                // Keep null/blank when no entry exists yet
-                $scores[$ids] = $entry['score'] ?? null;
-            }
-
-            $students[] = [
-                'student_id' => $sc['student_id'],
-                'firstname'  => $student['firstname'],
-                'lastname'   => $student['lastname'],
-                'scores'     => $scores
-            ];
-        }
-
-        usort($students, fn($a, $b) => strcmp($a['lastname'], $b['lastname']) ?: strcmp($a['firstname'], $b['firstname']));
-        return $students;
-    }
-
-    private function getHomeworkHeaders($classSectionId, $semester, $schoolYear)
-    {
-
-        $semVariants = $this->getSemesterVariants($semester);
-        $rows = $this->homeworkModel
-            ->select('homework_index')
-            ->where('class_section_id', $classSectionId)
-            //->where('teacher_id', $updatedBy)
-            ->whereIn('semester', $semVariants)
-            ->where('school_year', $schoolYear)
-            ->orderBy('homework_index', 'ASC')
-            ->findAll();
-
-        $headers = [];
-
-        foreach ($rows as $row) {
-            $index = $row['homework_index'];
-            if (!is_array($index)) {
-                $headers[$index] = true;
-            }
-        }
-
-        ksort($headers);
-        return array_keys($headers);
-    }
-
-    private function getSemesterVariants(?string $semester): array
-    {
-        $raw = trim((string) $semester);
-        $variants = [
-            $raw,
-            strtolower($raw),
-            ucfirst(strtolower($raw)),
-        ];
-        $normalized = $this->normalizeSemesterSelection($raw);
-        if ($normalized === 'fall') {
-            $variants[] = 'First Semester';
-            $variants[] = 'Semester 1';
-            $variants[] = '1st Semester';
-            $variants[] = 'Fall Semester';
-        } elseif ($normalized === 'spring') {
-            $variants[] = 'Second Semester';
-            $variants[] = 'Semester 2';
-            $variants[] = '2nd Semester';
-            $variants[] = 'Spring Semester';
-        }
-        return array_values(array_unique(array_filter($variants, static fn($v) => $v !== '')));
-    }
-
-    private function getSelectedSemester(): string
-    {
-        $session = session();
-        $selected = $session->get('teacher_scores_selected_semester');
-        if (!empty($selected)) {
-            return (string) $selected;
-        }
-        return $session->get('semester') ?? $this->semester;
-    }
-
-    private function normalizeSemesterSelection(?string $input): string
-    {
-        $value = strtolower(trim((string) $input));
-        if ($value === 'fall' || str_contains($value, '1')) {
-            return 'fall';
-        }
-        if ($value === 'spring' || str_contains($value, '2')) {
-            return 'spring';
-        }
-        return '';
-    }
-
-    private function normalizeSchoolYear(?string $input): ?string
-    {
-        $value = trim((string) $input);
-        if ($value === '') {
-            return null;
-        }
-        if (preg_match('/^\\d{4}\\s*[-\\/]\\s*\\d{4}$/', $value)) {
-            return preg_replace('/\\s+/', '', str_replace('/', '-', $value));
-        }
-        return null;
-    }
-}
diff --git a/app/Http/Controllers/old/HomeworkTrackingController.php b/app/Http/Controllers/old/HomeworkTrackingController.php
deleted file mode 100644
index 516941f9..00000000
--- a/app/Http/Controllers/old/HomeworkTrackingController.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\ConfigurationModel;
-use App\Models\CalendarModel;
-use App\Models\HomeworkModel;
-
-class HomeworkTrackingController extends BaseController
-{
-    protected $configModel;
-    protected $calendarModel;
-    protected $homeworkModel;
-    protected $db;
-
-    protected string $semester;
-    protected string $schoolYear;
-    /** cache for teacher assignment presence per term */
-    private array $teacherAssignmentCache = [];
-
-    public function __construct()
-    {
-        $this->configModel   = new ConfigurationModel();
-        $this->calendarModel = new CalendarModel();
-        $this->homeworkModel = new HomeworkModel();
-        $this->db            = \Config\Database::connect();
-
-        $this->semester   = (string) ($this->configModel->getConfig('semester') ?? '');
-        $this->schoolYear = (string) ($this->configModel->getConfig('school_year') ?? '');
-    }
-
-    public function index()
-    {
-        // Semester-based date range (Fall or Spring) derived from school year start.
-        [$start, $end] = $this->getDateRangeForSemester($this->schoolYear, $this->semester);
-
-        // Move start to the first Sunday on/after start
-        if ((int)$start->format('w') !== 0) {
-            $start = (clone $start)->modify('next sunday');
-        }
-
-        // Collect all Sundays within range
-        $sundays = [];
-        $d = clone $start;
-        while ($d <= $end) {
-            $sundays[] = $d->format('Y-m-d');
-            $d->modify('+7 days');
-        }
-
-        // Map "no school" events by date (Y-m-d) using explicit DB flag
-        $events    = $this->calendarModel->getEventsBySchoolYear($this->schoolYear) ?? [];
-        $eventDays = [];
-        foreach ($events as $ev) {
-            $ymd = substr((string)($ev['date'] ?? ''), 0, 10);
-            $no  = (int)($ev['no_school'] ?? 0);
-            if ($ymd && $no === 1) {
-                $eventDays[$ymd] = true; // yellow highlight for no-school day
-            }
-        }
-
-        // Map Sundays to ordinal homework_index, skipping event Sundays
-        $dateToIndex = [];
-        $idx = 0;
-        foreach ($sundays as $ymd) {
-            if (!isset($eventDays[$ymd])) {
-                $idx++;
-                $dateToIndex[$ymd] = $idx;
-            } else {
-                $dateToIndex[$ymd] = null; // event day (no homework expected)
-            }
-        }
-
-        $limitToSemester = $this->hasTeacherAssignments($this->schoolYear, $this->semester);
-
-        // Aggregate homework presence + first entered date per class_section_id + homework_index
-        $hwQ = $this->db->table('homework')
-            ->select('class_section_id, homework_index, MIN(created_at) AS first_created, COUNT(*) AS cnt')
-            ->where('school_year', $this->schoolYear);
-        if ($limitToSemester && $this->semester !== '') {
-            $hwQ->where('semester', $this->semester);
-        }
-        $rows = $hwQ->groupBy('class_section_id, homework_index')
-            ->get()
-            ->getResultArray();
-
-        $hasHomework = [];
-        $hwEnteredAt = [];
-        foreach ($rows as $r) {
-            $csid = (int)($r['class_section_id'] ?? 0);
-            $hi   = (int)($r['homework_index'] ?? 0);
-            $cnt  = (int)($r['cnt'] ?? 0);
-            if ($csid > 0 && $hi > 0 && $cnt > 0) {
-                $hasHomework[$csid][$hi] = true;
-                $dateStr = substr((string)($r['first_created'] ?? ''), 0, 10);
-                $hwEnteredAt[$csid][$hi] = $dateStr ?: null;
-            }
-        }
-
-        // Build date-based presence mapped to the nearest prior non-NoSchool Sunday.
-        $hb = $this->db->table('homework')
-            ->select("class_section_id, DATE(created_at) AS hw_date, MIN(created_at) AS first_created, COUNT(*) AS cnt", false)
-            ->where('school_year', $this->schoolYear);
-        if ($limitToSemester && $this->semester !== '') {
-            $hb->where('semester', $this->semester);
-        }
-        $rowsByDate = $hb->groupBy('class_section_id, DATE(created_at)', '', false)
-            ->orderBy('hw_date', 'ASC', false)
-            ->get()
-            ->getResultArray();
-
-        $hasHomeworkByDate = [];
-        $hwEnteredAtByDate = [];
-        foreach ($rowsByDate as $r) {
-            $csid = (int)($r['class_section_id'] ?? 0);
-            $d    = substr((string)($r['hw_date'] ?? ''), 0, 10);
-            $cnt  = (int)($r['cnt'] ?? 0);
-            $firstCreated = substr((string)($r['first_created'] ?? ''), 0, 10);
-            if ($csid <= 0 || !$d || $cnt <= 0) { continue; }
-
-            // Find the index of the last Sunday on or before $d
-            $baseIndex = -1;
-            for ($i = count($sundays) - 1; $i >= 0; $i--) {
-                if ($sundays[$i] <= $d) { $baseIndex = $i; break; }
-            }
-            if ($baseIndex < 0) { continue; }
-
-            // Map this homework day to only the nearest prior non–No School Sunday
-            $j = $baseIndex;
-            while ($j >= 0 && !empty($eventDays[$sundays[$j]])) { $j--; }
-            if ($j < 0) { continue; }
-            $sd = $sundays[$j];
-
-            // Mark homework on that Sunday for this class_section (single mapping)
-            $hasHomeworkByDate[$csid][$sd] = true;
-            if (empty($hwEnteredAtByDate[$csid][$sd])) {
-                $hwEnteredAtByDate[$csid][$sd] = $firstCreated ?: $d;
-            } else {
-                // Keep the earliest date for display
-                $existing = (string)$hwEnteredAtByDate[$csid][$sd];
-                $candidate = $firstCreated ?: $d;
-                if ($candidate && (!$existing || $candidate < $existing)) {
-                    $hwEnteredAtByDate[$csid][$sd] = $candidate;
-                }
-            }
-        }
-
-        // Fetch teachers and TAs per section for this term
-        $tb = $this->db->table('teacher_class tc')
-            ->select('tc.class_section_id, tc.position, cs.class_section_name, cs.class_id, u.firstname, u.lastname')
-            ->join('classSection cs', 'cs.class_section_id = tc.class_section_id', 'left')
-            ->join('users u', 'u.id = tc.teacher_id', 'left')
-            ->where('tc.school_year', $this->schoolYear);
-        $teacherRows = $tb->where('tc.class_section_id IS NOT NULL', null, false)
-            ->whereIn('tc.position', ['main','ta'])
-            ->orderBy('cs.class_id', 'ASC')
-            ->orderBy('cs.class_section_name', 'ASC')
-            ->orderBy("FIELD(tc.position, 'main','ta')", '', false)
-            ->orderBy('u.firstname', 'ASC')
-            ->get()
-            ->getResultArray();
-
-        $bySection = [];
-        foreach ($teacherRows as $r) {
-            $sid = (int)($r['class_section_id'] ?? 0);
-            if ($sid <= 0) continue;
-            if (!isset($bySection[$sid])) {
-                $bySection[$sid] = [
-                    'class_section_id'   => $sid,
-                    'class_id'           => (int)($r['class_id'] ?? 0),
-                    'class_section_name' => (string)($r['class_section_name'] ?? ''),
-                    'teachers'           => [],
-                    'tas'                => [],
-                ];
-            }
-            $name = trim(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? ''));
-            $pos  = strtolower((string)($r['position'] ?? ''));
-            if ($name !== '') {
-                if ($pos === 'main') { $bySection[$sid]['teachers'][] = $name; }
-                elseif ($pos === 'ta') { $bySection[$sid]['tas'][] = $name; }
-            }
-        }
-
-        $teachers = array_values($bySection);
-
-        // Sort by grade order: KG(13) → Grade 1..11 → Youth(12) → others
-        usort($teachers, function ($a, $b) {
-            $ai = (int)($a['class_id'] ?? 0);
-            $bi = (int)($b['class_id'] ?? 0);
-            $ord = function ($cid) {
-                if ($cid === 13) return 0;      // KG first
-                if ($cid >= 1 && $cid <= 11) return $cid; // Grades 1..11
-                if ($cid === 12) return 99;     // Youth last of known
-                return 200 + $cid;              // any others after
-            };
-            $cmp = $ord($ai) <=> $ord($bi);
-            if ($cmp !== 0) return $cmp;
-            return strnatcasecmp($a['class_section_name'] ?? '', $b['class_section_name'] ?? '');
-        });
-
-        // Simple server-side pagination for rows (8 lines per page)
-        $perPage = 8;
-        $totalRows = count($teachers);
-        $totalPages = max(1, (int)ceil($totalRows / $perPage));
-        $page = (int) ($this->request->getGet('page') ?? 1);
-        if ($page < 1) $page = 1;
-        if ($page > $totalPages) $page = $totalPages;
-        $offset = ($page - 1) * $perPage;
-        $teachersPage = array_slice($teachers, $offset, $perPage);
-
-        return view('grading/homework_tracking', [
-            'semester'     => $this->semester,
-            'schoolYear'   => $this->schoolYear,
-            'sundays'      => $sundays,
-            'eventDays'    => $eventDays,
-            'dateToIndex'  => $dateToIndex,
-            'teachers'     => $teachersPage,
-            'hasHomework'  => $hasHomework,
-            'hwEnteredAt'  => $hwEnteredAt,
-            'hasHomeworkByDate' => $hasHomeworkByDate,
-            'hwEnteredAtByDate' => $hwEnteredAtByDate,
-            'page'         => $page,
-            'totalPages'   => $totalPages,
-            'perPage'      => $perPage,
-            'totalRows'    => $totalRows,
-        ]);
-    }
-
-    /**
-     * Returns true if teacher_class has any rows for the given school year.
-     * The semester argument is ignored because assignments are tracked per year.
-     */
-    private function hasTeacherAssignments(string $schoolYear, string $semester): bool
-    {
-        $year = trim((string)$schoolYear);
-        if ($year === '') {
-            return false;
-        }
-
-        if (array_key_exists($year, $this->teacherAssignmentCache)) {
-            return $this->teacherAssignmentCache[$year];
-        }
-
-        $cnt = $this->db->table('teacher_class')
-            ->where('school_year', $year)
-            ->countAllResults();
-
-        $this->teacherAssignmentCache[$year] = $cnt > 0;
-        return $this->teacherAssignmentCache[$year];
-    }
-
-    /**
-     * Compute start/end dates for the given semester within the school year.
-     * Fall: 09/21/{startYear} to 01/18/{startYear+1}
-     * Spring: 01/25/{startYear+1} to 05/31/{startYear+1}
-     * Defaults to today if parsing fails.
-     */
-    private function getDateRangeForSemester(string $schoolYear, string $semester): array
-    {
-        $startYear = null;
-        if (preg_match('/\b(20\d{2})\b/', $schoolYear, $m)) {
-            $startYear = (int)$m[1];
-        }
-        if ($startYear === null) {
-            $today = new \DateTime('today');
-            return [$today, $today];
-        }
-
-        $nextYear = $startYear + 1;
-        $sem = strtolower(trim($semester));
-
-        $start = $end = null;
-        try {
-            if ($sem === 'spring') {
-                $start = new \DateTime("{$nextYear}-01-25");
-                $end   = new \DateTime("{$nextYear}-05-31");
-            } else {
-                // default/fall
-                $start = new \DateTime("{$startYear}-09-21");
-                $end   = new \DateTime("{$nextYear}-01-18");
-            }
-        } catch (\Throwable $e) {
-            $today = new \DateTime('today');
-            return [$today, $today];
-        }
-
-        return [$start, $end];
-    }
-}
diff --git a/app/Http/Controllers/old/InvoiceController.php b/app/Http/Controllers/old/InvoiceController.php
deleted file mode 100644
index a3c68296..00000000
--- a/app/Http/Controllers/old/InvoiceController.php
+++ /dev/null
@@ -1,1701 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-require_once APPPATH . 'ThirdParty/fpdf/fpdf.php';
-
-use App\Models\InvoiceModel;
-use App\Models\InvoiceStudentListModel;
-use App\Models\StudentModel;
-use App\Models\EnrollmentModel;
-use App\Models\StudentClassModel;
-use App\Models\ConfigurationModel;
-use App\Models\EventChargesModel;
-use App\Models\UserModel;
-use App\Models\AdditionalChargeModel;
-use App\Models\PaymentModel;
-use App\Models\InvoiceEventModel;
-use App\Models\ClassSectionModel;
-use App\Models\DiscountUsageModel;
-use App\Models\RefundModel;
-use DateTime;
-use DateTimeZone;
-
-
-use CodeIgniter\RESTful\ResourceController;
-
-class InvoiceController extends ResourceController
-{
-    protected $invoiceModel;
-    protected $additionalChargeModel;
-    protected $studentModel;
-    protected $enrollmentModel;
-    protected $invoicestudentModel;
-    protected $schoolYear;  // Declare global variable for the controller
-    protected $semester;
-    protected $dueDate;
-    protected $db;
-    protected $configModel;
-    protected $userModel;
-    protected $studentClassModel;
-    protected $firstStudentFee;
-    protected $secondStudentFee;
-    protected $youthFee;
-    protected $refundDeadline;
-    protected $invoiceEventModel;
-    protected $paymentModel;
-    protected $chargesModel;
-    protected $discountUsageModel;
-    protected $refundModel;
-    protected $request;
-    protected $gradeFee;
-    protected $classSectionModel;
-
-    public function __construct()
-    {
-        $this->additionalChargeModel = new AdditionalChargeModel();
-        $this->classSectionModel = new ClassSectionModel();
-        $this->invoiceModel = new InvoiceModel();
-        $this->invoicestudentModel = new InvoiceStudentListModel();
-        $this->studentModel = new StudentModel();
-        $this->enrollmentModel = new EnrollmentModel();
-        $this->configModel = new ConfigurationModel();
-        $this->userModel = new UserModel();
-        $this->studentClassModel = new StudentClassModel();
-        $this->invoiceEventModel = new InvoiceEventModel();
-        $this->paymentModel = new PaymentModel();
-        $this->chargesModel = new EventChargesModel();
-        $this->discountUsageModel = new DiscountUsageModel();
-        $this->refundModel = new RefundModel();
-
-        $this->gradeFee = $this->configModel->getConfig('grade_fee');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->dueDate = $this->configModel->getConfig('due_date');
-        $this->firstStudentFee = (float) ($this->configModel->getConfig('first_student_fee') ?? 350);
-        $this->secondStudentFee = (float) ($this->configModel->getConfig('second_student_fee') ?? 200);
-        $this->youthFee = (float) ($this->configModel->getConfig('youth_fee') ?? 180);
-        $this->refundDeadline = date('Y-m-d', strtotime($this->configModel->getConfig('refund_deadline')));
-        $this->db = \Config\Database::connect();
-        $this->request = \Config\Services::request();
-    }
-
-    public function index($schoolYear = null)
-    {
-        // Get school years from invoices
-        $schoolYears = $this->invoiceModel
-            ->select('school_year')
-            ->distinct()
-            ->orderBy('school_year', 'DESC')
-            ->findAll();
-
-        // Default school year
-        if (!$schoolYear) {
-            $schoolYear = $this->schoolYear;
-        }
-
-        log_message('info', "Selected school year for invoice retrieval: $schoolYear");
-
-        $invoiceData = [];
-        $parents = $this->userModel->getUsersByRoleAndSchoolYear('parent', $schoolYear);
-
-        foreach ($parents as $parent) {
-            $students = $this->studentModel->where('parent_id', $parent['id'])->findAll();
-
-            $parentData = [
-                'parent_name' => $parent['firstname'] . ' ' . $parent['lastname'],
-                'parent_id' => $parent['id'],
-                'enrolledKids' => [],
-                'withdrawnKids' => [],
-                'invoice_amount' => 0,
-                'refund_amount' => 0, // default
-                'last_updated' => null,
-                'invoice_date' => null
-            ];
-
-            // Fetch most recent invoice
-            $invoices = $this->invoiceModel->getInvoicesByParentId($parent['id'], $schoolYear);
-            foreach ($invoices as $invoice) {
-                if ($invoice) {
-                    $parentData['invoice_amount'] = $invoice['total_amount'];
-                    $parentData['last_updated'] = $invoice['updated_at'];
-                    // Prefer issue_date (UTC) and render in configured/user local time for display
-                    $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-                    $parentData['invoice_date'] = !empty($invoice['issue_date'])
-                        ? (new \DateTimeImmutable($invoice['issue_date'], new \DateTimeZone('UTC')))
-                            ->setTimezone(new \DateTimeZone($tzName))
-                            ->format('Y-m-d H:i:s')
-                        : ($invoice['updated_at'] ?? null);
-                    $parentData['invoice_id'] = $invoice['id'];
-
-                    // ✅ Fetch refund amount actually PAID this year (Partial/Paid)
-                    $refund = $this->db->table('refunds')
-                        ->select('COALESCE(SUM(refund_paid_amount),0) AS refund_paid_amount')
-                        ->where('parent_id', $parent['id'])
-                        ->where('school_year', $schoolYear)
-                        ->whereIn('status', ['Partial','Paid'])
-                        ->get()
-                        ->getRowArray();
-
-                    $parentData['refund_amount'] = (float)($refund['refund_paid_amount'] ?? 0.0);
-
-                    log_message('info', "Latest invoice for parent {$parent['firstname']} {$parent['lastname']} in school year $schoolYear: Amount = {$invoice['total_amount']}, Updated at = {$invoice['updated_at']}");
-                } else {
-                    log_message('error', "No invoice found for parent {$parent['firstname']} {$parent['lastname']} in school year $schoolYear.");
-                }
-            }
-
-            foreach ($students as $student) {
-                $studentClass = $this->db->table('student_class')
-                    ->where('student_id', $student['id'])
-                    ->where('school_year', $schoolYear)
-                    ->get()->getRowArray();
-
-                $grade = 'N/A';
-                if ($studentClass && isset($studentClass['class_section_id'])) {
-                    $classSection = $this->db->table('classSection')
-                        ->where('class_section_id', $studentClass['class_section_id'])
-                        ->get()->getRowArray();
-
-                    if ($classSection && isset($classSection['class_section_name'])) {
-                        $grade = $classSection['class_section_name'];
-                    }
-                }
-
-                $enrollments = $this->enrollmentModel
-                    ->where('student_id', $student['id'])
-                    ->where('school_year', $schoolYear)
-                    ->findAll();
-
-                foreach ($enrollments as $enrollment) {
-                    $kidData = [
-                        'name' => $student['firstname'] . ' ' . $student['lastname'],
-                        'grade' => $grade,
-                        'tuition_fee' => $enrollment['tuition_fee'] ?? 0
-                    ];
-
-                    switch ($enrollment['enrollment_status']) {
-                        case 'payment pending':
-                        case 'enrolled':
-                            $parentData['enrolledKids'][] = $kidData;
-                            break;
-                        case 'withdraw under review':
-                        case 'withdrawn':
-                        case 'refund pending':
-                            $parentData['withdrawnKids'][] = $kidData;
-                            break;
-                        case 'admission under review':
-                            log_message('info', "Student ID {$student['id']} is under admission review and not included in the invoice.");
-                            break;
-                        case 'waitlist':
-                            log_message('info', "Student ID {$student['id']} is in waitlist and not included in the invoice.");
-                            break;
-                        case 'denied':
-                            log_message('info', "Student ID {$student['id']} is denied and not included in the invoice.");
-                            break;
-                        default:
-                            log_message('error', "Unexpected enrollment status '{$enrollment['enrollment_status']}' for student ID {$student['id']}.");
-                            break;
-                    }
-                }
-            }
-
-            if (!empty($parentData['enrolledKids']) || !empty($parentData['withdrawnKids'])) {
-                $invoiceData[] = $parentData;
-            }
-        }
-
-        return view('invoice_payment/invoice_management', [
-            'invoices' => $invoiceData,
-            'schoolYears' => $schoolYears,
-            'selectedYear' => $schoolYear,
-            'parents' => array_column($invoiceData, 'parent_name')
-        ]);
-    }
-
-    /**
-     * API: Invoice management composite data (used by invoice_management view)
-     * Returns the same structure previously rendered server-side in index().
-     */
-    public function managementData()
-    {
-        $schoolYear = trim((string)($this->request->getGet('schoolYear') ?? $this->request->getGet('year') ?? ''));
-        if ($schoolYear === '') {
-            $schoolYear = $this->schoolYear;
-        }
-
-        $invoiceData = [];
-        try {
-            // Distinct school years (for selector)
-            $yearsRows = $this->invoiceModel
-                ->select('school_year')
-                ->distinct()
-                ->orderBy('school_year', 'DESC')
-                ->findAll();
-            $schoolYears = array_values(array_filter(array_map(static function ($r) {
-                return isset($r['school_year']) ? (string)$r['school_year'] : null;
-            }, $yearsRows)));
-            if (empty($schoolYears)) {
-                $schoolYears = [$this->schoolYear];
-            }
-
-            $parents = $this->userModel->getUsersByRoleAndSchoolYear('parent', $schoolYear);
-
-            foreach ($parents as $parent) {
-                $students = $this->studentModel->where('parent_id', $parent['id'])->findAll();
-
-                $parentData = [
-                    'parent_name'   => trim(($parent['firstname'] ?? '') . ' ' . ($parent['lastname'] ?? '')),
-                    'parent_id'     => (int)$parent['id'],
-                    'enrolledKids'  => [],
-                    'withdrawnKids' => [],
-                    'invoice_amount'=> 0,
-                    'refund_amount' => 0,
-                    'last_updated'  => null,
-                    'invoice_date'  => null,
-                    'invoice_id'    => null,
-                ];
-
-                // Latest invoice
-                $invoices = $this->invoiceModel->getInvoicesByParentId($parent['id'], $schoolYear);
-                foreach ($invoices as $invoice) {
-                    if ($invoice) {
-                        $parentData['invoice_amount'] = (float)($invoice['total_amount'] ?? 0);
-                        $parentData['last_updated']   = $invoice['updated_at'] ?? null;
-                        // Prefer issue_date (UTC) -> local; fall back to updated_at/created_at
-                        if (!empty($invoice['issue_date'])) {
-                            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-                            $parentData['invoice_date'] = (new \DateTimeImmutable($invoice['issue_date'], new \DateTimeZone('UTC')))
-                                ->setTimezone(new \DateTimeZone($tzName))
-                                ->format('Y-m-d H:i:s');
-                        } else {
-                            $parentData['invoice_date'] = date('Y-m-d H:i:s', strtotime($invoice['updated_at'] ?? $invoice['created_at'] ?? 'now'));
-                        }
-                        $parentData['invoice_id']     = $invoice['id'] ?? null;
-
-                        // Refund total paid for parent/year (Partial/Paid)
-                        $refund = $this->db->table('refunds')
-                            ->select('COALESCE(SUM(refund_paid_amount),0) AS refund_paid_amount')
-                            ->where('parent_id', $parent['id'])
-                            ->where('school_year', $schoolYear)
-                            ->whereIn('status', ['Partial','Paid'])
-                            ->get()->getRowArray();
-                        $parentData['refund_amount'] = (float)($refund['refund_paid_amount'] ?? 0.0);
-                        break; // only most recent as before
-                    }
-                }
-
-                // Build kids lists based on enrollment statuses
-                foreach ($students as $student) {
-                    $studentClass = $this->db->table('student_class')
-                        ->where('student_id', $student['id'])
-                        ->where('school_year', $schoolYear)
-                        ->get()->getRowArray();
-
-                    $grade = 'N/A';
-                    if ($studentClass && isset($studentClass['class_section_id'])) {
-                        $classSection = $this->db->table('classSection')
-                            ->where('class_section_id', $studentClass['class_section_id'])
-                            ->get()->getRowArray();
-                        if ($classSection && isset($classSection['class_section_name'])) {
-                            $grade = $classSection['class_section_name'];
-                        }
-                    }
-
-                    $enrollments = $this->enrollmentModel
-                        ->where('student_id', $student['id'])
-                        ->where('school_year', $schoolYear)
-                        ->findAll();
-
-                    foreach ($enrollments as $enrollment) {
-                        $kid = [
-                            'name'        => trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? '')),
-                            'grade'       => $grade,
-                            'tuition_fee' => (float)($enrollment['tuition_fee'] ?? 0),
-                        ];
-                        switch ($enrollment['enrollment_status']) {
-                            case 'payment pending':
-                            case 'enrolled':
-                                $parentData['enrolledKids'][] = $kid;
-                                break;
-                            case 'withdraw under review':
-                            case 'withdrawn':
-                            case 'refund pending':
-                                $parentData['withdrawnKids'][] = $kid;
-                                break;
-                            default:
-                                // ignore others for invoice summary
-                                break;
-                        }
-                    }
-                }
-
-                if (!empty($parentData['enrolledKids']) || !empty($parentData['withdrawnKids'])) {
-                    $invoiceData[] = $parentData;
-                }
-            }
-
-            return $this->response->setJSON([
-                'ok'           => true,
-                'schoolYear'   => $schoolYear,
-                'schoolYears'  => $schoolYears,
-                'invoices'     => $invoiceData,
-            ]);
-        } catch (\Throwable $e) {
-            log_message('error', 'managementData error: ' . $e->getMessage());
-            return $this->response->setStatusCode(500)->setJSON(['ok' => false, 'error' => 'Server error']);
-        }
-    }
-
-
-    private function hasClassAssignment(string $schoolYear, string $parentId): bool
-    {
-        //$parentId = session()->get('user_id');
-
-        if (!$parentId) {
-            return false;
-        }
-
-
-        // Get all students for the parent
-        $students = $this->studentModel->where('parent_id', $parentId)->findAll();
-
-        if (empty($students)) {
-            return false;
-        }
-
-        // Check if at least one student has a class assignment
-        foreach ($students as $student) {
-            $studentId = $student['id'];
-
-            $exists = $this->studentClassModel
-                ->where('student_id', $studentId)
-                ->where('school_year', $schoolYear)
-                ->first();
-
-            if ($exists) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function generateInvoice(string $parentId = null)
-    {
-        $isAjax = $this->request->isAJAX() || str_contains(strtolower($this->request->getHeaderLine('Accept')), 'application/json');
-        if ($parentId == null) {
-            $parentId = (int)$this->request->getPost('parent_id');
-        }
-        $schoolYear = (string) $this->schoolYear;
-
-        // Fetch enrolled + withdrawn students
-        $enrollments = $this->enrollmentModel
-            ->where('parent_id', $parentId)
-            ->where('school_year', $this->schoolYear)
-            ->findAll();
-
-        if (empty($enrollments)) {
-            if ($isAjax) {
-                return $this->response->setJSON(['ok' => false, 'message' => 'No enrollment records found.']);
-            }
-            return redirect()->back()->with('error', 'No enrollment records found.');
-        }
-
-        $registeredKids = [];
-        $withdrawnKids = [];
-
-        foreach ($enrollments as $enrollment) {
-            $studentData = [
-                'student_id'        => $enrollment['student_id'],
-                'parent_id'         => $enrollment['parent_id'],
-                'class_section_id'  => $enrollment['class_section_id'],
-                'enrollment_status' => $enrollment['enrollment_status'],
-                'school_year'       => $enrollment['school_year'],
-                'semester'          => $enrollment['semester'],
-                'admission_status'  => $enrollment['admission_status'],
-                'is_withdrawn'      => $enrollment['is_withdrawn']
-            ];
-
-            // Treat 'payment pending' and 'enrolled' as billable regardless of admission_status,
-            // since admin mapping should have already normalized this to 'accepted'.
-            // This makes the calculation resilient to legacy data.
-            if (in_array($enrollment['enrollment_status'], ['enrolled', 'payment pending'], true)) {
-                $registeredKids[] = $studentData;
-            } elseif (in_array($enrollment['enrollment_status'], ['withdrawn', 'refund pending', 'withdraw under review'])) {
-                $withdrawnKids[] = $studentData;
-            } else {
-                log_message('info', "Enrollment skipped for student_id {$enrollment['student_id']} with status: {$enrollment['enrollment_status']} and admission_status: {$enrollment['admission_status']}");
-            }
-        }
-
-        $registeredKids = array_values(array_filter($registeredKids, function ($student) use ($schoolYear) {
-            $sid = (int)($student['student_id'] ?? 0);
-            return $sid > 0 && $this->studentClassModel->hasNonEventAssignment($sid, $schoolYear);
-        }));
-
-        $withdrawnKids = array_values(array_filter($withdrawnKids, function ($student) use ($schoolYear) {
-            $sid = (int)($student['student_id'] ?? 0);
-            return $sid > 0 && $this->studentClassModel->hasNonEventAssignment($sid, $schoolYear);
-        }));
-
-        // ✅ Use your helper to calculate tuition fee
-        $fees = $this->calculateTuitionFee($registeredKids, $withdrawnKids);
-        $tuitionFee = $fees['tuition_fee'];
-
-        // ✅ Fetch event charges
-        $eventsList = $this->chargesModel->getChargesWithEventInfo($parentId, $this->schoolYear);
-        $eventchargeTotal = array_sum(array_column($eventsList, 'charged'));
-
-        $totalDiscount = $this->recalculateAndUpdateDiscount(
-            $parentId,
-            $this->schoolYear,
-            $tuitionFee,
-            $enrollments
-        );
-
-        $semester = $this->semester;
-        // ✅ Refunds PAID to the parent for this year (Partial/Paid)
-        $refundPaid = (float) $this->refundModel->getTotalApprovedRefundByParentIdAndSchoolYear($parentId, $this->schoolYear);
-
-        $totalPaid = $this->paymentModel->getTotalPaidByParentId($parentId, $this->schoolYear);
-
-        $discountedTuition = max(0, $tuitionFee);
-        $totalAmount = $discountedTuition + $eventchargeTotal;
-
-        // Parent-level balance (informational); we will recalc per invoice below
-        $parentBalance = $totalAmount  // original charges (tuition + events)
-            - $totalDiscount           // any applied discounts/vouchers
-            - $refundPaid              // approved refunds paid to parent
-            - $totalPaid;              // payments received
-
-        // Your invoice fetch
-        $existingInvoices = $this->invoiceModel->getInvoicesByParentId($parentId, $this->schoolYear);
-
-        $updated = false;
-
-        $updatedIds = [];
-        if (!empty($existingInvoices)) {
-            foreach ($existingInvoices as $invoice) {
-                if (!isset($invoice['id'])) {
-                    continue;
-                }
-
-                // Preserve applied additional charges and recalc this invoice only
-                $extrasSum = 0.0;
-                try {
-                    $rows = $this->db->table('additional_charges')
-                        ->select('charge_type, amount')
-                        ->where('invoice_id', (int)$invoice['id'])
-                        ->where('school_year', $this->schoolYear)
-                        ->where('status', 'applied')
-                        ->get()->getResultArray();
-                    foreach ($rows as $r) {
-                        $amt  = (float)($r['amount'] ?? 0);
-                        $typ  = strtolower((string)($r['charge_type'] ?? 'add'));
-                        if ($typ === 'deduct') $amt = -abs($amt); else $amt = abs($amt);
-                        $extrasSum += $amt;
-                    }
-                } catch (\Throwable $e) {
-                    log_message('error', 'additional_charges sum failed for invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
-                }
-
-                $newTotal   = round($totalAmount + $extrasSum, 2);
-
-                // Per-invoice discount
-                $invDiscount = 0.0;
-                try {
-                    $d = $this->db->table('discount_usages')
-                        ->select('COALESCE(SUM(discount_amount),0) AS tot')
-                        ->where('invoice_id', (int)$invoice['id'])
-                        ->get()->getRowArray();
-                    $invDiscount = (float)($d['tot'] ?? 0.0);
-                } catch (\Throwable $e) {
-                    log_message('error', 'discount sum failed for invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
-                }
-
-                // Per-invoice refunds paid
-                $invRefunds = 0.0;
-                try {
-                    $r = $this->db->table('refunds')
-                        ->select('COALESCE(SUM(refund_paid_amount),0) AS tot')
-                        ->where('invoice_id', (int)$invoice['id'])
-                        ->where('school_year', $this->schoolYear)
-                        ->whereIn('status', ['Partial','Paid'])
-                        ->get()->getRowArray();
-                    $invRefunds = (float)($r['tot'] ?? 0.0);
-                } catch (\Throwable $e) {
-                    log_message('error', 'refund sum failed for invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
-                }
-
-                // Payments recorded on this invoice (denormalized field kept in sync by PaymentController)
-                $paidOnInv  = (float)($invoice['paid_amount'] ?? 0.0);
-
-                $newBalance = $newTotal - $invDiscount - $invRefunds - $paidOnInv;
-                $newStatus  = ($newBalance <= 0.00001)
-                    ? 'Paid'
-                    : (($paidOnInv > 0) ? 'Partially Paid' : 'Unpaid');
-
-                $this->invoiceModel->update($invoice['id'], [
-                    'total_amount' => $newTotal,
-                    'paid_amount'  => $paidOnInv,
-                    'balance'      => $newBalance,
-                'status'       => $newStatus,
-                    'updated_at'   => utc_now()
-                ]);
-
-                $updatedIds[] = (int)$invoice['id'];
-                log_message('info', "Updated invoice ID {$invoice['id']} for parent ID {$parentId}.");
-                $updated = true;
-            }
-        } else {
-            // Generate invoice number
-            $schoolId = $this->userModel->getSchoolIdByUserId($parentId);
-            if (!empty($schoolId)) {
-                $invoiceNumber = 'INV-' . $schoolId . '-' . uniqid();
-            } else {
-                log_message('warning', "No school ID found for parent_id {$parentId}, generating fallback invoice number.");
-                $invoiceNumber = uniqid('INV-');
-            }
-
-            $issueUtc = (new DateTime('now', new DateTimeZone('UTC')))->format('Y-m-d H:i:s');
-
-            // Due date: interpret the date in configured/user local TZ,
-            // set a default time (noon to avoid DST edge cases), then convert to UTC.
-            $dueUtc = null;
-            if (!empty($this->dueDate)) {
-                $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-                $dueLocal = new DateTime($this->dueDate . ' 19:59:59', new DateTimeZone($tzName));
-                $dueLocal->setTimezone(new DateTimeZone('UTC'));
-                $dueUtc = $dueLocal->format('Y-m-d H:i:s');
-            }
-
-            $insertId = $this->invoiceModel->insert([
-                'parent_id'      => $parentId,
-                'invoice_number' => $invoiceNumber,
-                'total_amount'   => $totalAmount,
-                'paid_amount'    => 0,
-                // Initial balance equals the created total; discounts/refunds/payments will adjust later
-                'balance'        => $totalAmount,
-                'status'         => 'Unpaid',
-                'school_year'    => $this->schoolYear,
-                'semester'       => $semester,
-                'issue_date'     => $issueUtc,
-                'due_date'       => $dueUtc,
-                'created_at'     => utc_now(),
-                'updated_at'     => utc_now()
-            ]);
-
-            if (!$insertId) {
-                log_message('error', 'Invoice insert failed: ' . json_encode($this->invoiceModel->errors()));
-                if ($isAjax) {
-                    return $this->response->setJSON(['ok' => false, 'message' => 'Failed to create invoice.']);
-                }
-                return redirect()->back()->with('error', 'Failed to create invoice. Please check input values.');
-            } else {
-                log_message('info', "Invoice created successfully. Insert ID: {$insertId}");
-            }
-            $updated = false;
-        }
-
-        // Success response
-        if ($isAjax) {
-            return $this->response->setJSON([
-                'ok'      => true,
-                'updated' => $updated,
-                'updated_ids' => $updatedIds,
-                'insert_id'   => isset($insertId) ? (int)$insertId : null,
-                csrf_token()  => csrf_hash(),
-                'csrfTokenName' => csrf_token(),
-                'csrfHash'      => csrf_hash(),
-            ]);
-        }
-
-        return redirect()->to(route_to('InvoiceController::index'))
-            ->with('success', $updated ? 'Invoice updated.' : 'Invoice created.');
-    }
-
-    private function recalculateAndUpdateDiscount(
-        int $parentId,
-        string $schoolYear,
-        float $tuitionFee,
-        array $enrollments
-    ): float {
-        $totalDiscount = 0.00;
-        $eventchargeTotal = 0.0;
-        try {
-            $eventsList = $this->chargesModel->getChargesWithEventInfo($parentId, $schoolYear);
-            $eventchargeTotal = array_sum(array_column($eventsList, 'charged'));
-        } catch (\Throwable $e) {
-            log_message('error', 'Failed to load event charges for discount recalculation: ' . $e->getMessage());
-        }
-
-        // Get all invoices for this parent and school year
-        $invoices = $this->invoiceModel->getInvoicesByParentId($parentId, $schoolYear);
-
-        if (empty($invoices)) {
-            log_message('info', "No invoices found for parent ID $parentId in school year $schoolYear.");
-            return 0.00;
-        }
-
-        foreach ($invoices as $invoice) {
-            if (!isset($invoice['id'])) {
-                continue;
-            }
-
-            $invoiceId = $invoice['id'];
-
-            // Get discount usage + voucher details
-            $discountUsage = $this->db->table('discount_usages du')
-                ->select('du.id, dv.id as voucher_id, dv.discount_type, dv.discount_value')
-                ->join('discount_vouchers dv', 'du.voucher_id = dv.id')
-                ->join('invoices i', 'du.invoice_id = i.id')
-                ->where('du.invoice_id', $invoiceId)
-                ->where('i.school_year', $schoolYear)
-                ->get()
-                ->getRowArray();
-
-            if (!$discountUsage) {
-                log_message('info', "No discount applied to invoice ID $invoiceId.");
-                continue;
-            }
-
-            $extrasSum = 0.0;
-            try {
-                $rows = $this->db->table('additional_charges')
-                    ->select('charge_type, amount')
-                    ->where('invoice_id', (int)$invoice['id'])
-                    ->where('school_year', $schoolYear)
-                    ->where('status', 'applied')
-                    ->get()->getResultArray();
-                foreach ($rows as $r) {
-                    $amt  = (float)($r['amount'] ?? 0);
-                    $typ  = strtolower((string)($r['charge_type'] ?? 'add'));
-                    if ($typ === 'deduct') $amt = -abs($amt); else $amt = abs($amt);
-                    $extrasSum += $amt;
-                }
-            } catch (\Throwable $e) {
-                log_message('error', 'additional_charges sum failed for discount recalculation invoice ' . (int)$invoice['id'] . ': ' . $e->getMessage());
-            }
-
-            $baseTotal = round($tuitionFee + $eventchargeTotal + $extrasSum, 2);
-
-            // Recalculate discount
-            if ($discountUsage['discount_type'] === 'percent') {
-                $discountAmount = round(($baseTotal * $discountUsage['discount_value']) / 100, 2);
-            } else {
-                $discountAmount = min($discountUsage['discount_value'], $baseTotal);
-            }
-
-            // Update discount usage
-            $this->db->table('discount_usages')
-                ->where('id', $discountUsage['id'])
-                ->update([
-                    'discount_amount' => $discountAmount,
-                    'updated_at' => utc_now(),
-                    'updated_by' => session()->get('user_id')
-                ]);
-
-            $totalDiscount += $discountAmount;
-
-            // Log enrollment summary
-            $added = [];
-            $withdrawn = [];
-            foreach ($enrollments as $e) {
-                if (
-                    in_array($e['enrollment_status'], ['enrolled', 'payment pending']) &&
-                    $e['admission_status'] === 'accepted'
-                ) {
-                    $added[] = $e['student_id'];
-                } elseif (in_array($e['enrollment_status'], ['withdrawn', 'refund pending', 'withdraw under review'])) {
-                    $withdrawn[] = $e['student_id'];
-                }
-            }
-
-            log_message('info', "Recalculated discount for invoice ID $invoiceId: Added students [" . implode(',', $added) . "], Withdrawn students [" . implode(',', $withdrawn) . "]. Discount updated to $discountAmount.");
-        }
-
-        return $totalDiscount;
-    }
-
-
-    /**
-     * Returns an array:
-     * [
-     *   'tuition_fee'   => <float>,   // what the parent still owes after any withdrawals
-     *   'refund_amount' => <float>,   // what the school should return (0 if none)
-     * ]
-     */
-    private function calculateTuitionFee(array $registeredKids, array $withdrawnKids): array
-    {
-        // If we are within the refund window, exclude withdrawn kids from billing.
-        // After the deadline, treat withdrawn kids as billable (no refunds allowed).
-        try {
-            $tzName      = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-            $tz          = new \DateTimeZone($tzName);
-            $today       = new \DateTimeImmutable('today', $tz);
-            $deadline    = new \DateTimeImmutable($this->refundDeadline, $tz);
-            $refundOk    = $today <= $deadline;
-        } catch (\Throwable $e) {
-            $refundOk = true; // default conservative
-        }
-
-        $tuitionStudents = $refundOk ? $registeredKids : array_merge($registeredKids, $withdrawnKids);
-
-        $tuitionFee = $this->calculateTotalTuitionFee($tuitionStudents);
-
-        log_message('info', 'Total Tuition Fee (refund ' . ($refundOk ? 'allowed' : 'not allowed') . ") = $tuitionFee");
-
-        return [
-            'tuition_fee'   => $tuitionFee,
-        ];
-    }
-
-    private function calculateTotalTuitionFee(array $students): float
-    {
-        // 1) Normalize each student's grade name (once)
-        foreach ($students as &$student) {
-            $gradeName       = $this->classSectionModel
-                ->getClassSectionNameBySectionId($student['class_section_id']);
-            $student['grade'] = strtoupper(trim($gradeName));
-        }
-        unset($student); // break reference
-
-        // 2) Partition into regular (<= grade 9) vs youth (> grade 9)
-        $regularCount = 0;
-        $youthCount   = 0;
-
-        foreach ($students as $student) {
-            $levelInfo = $this->getGradeLevel($student['grade']);
-            $level     = (int) ($levelInfo['level'] ?? 999);
-
-            // Youth if level > $this->gradeFee (e.g., gradeFee = 9)
-            if ($level > $this->gradeFee) {
-                $youthCount++;
-            } else {
-                $regularCount++;
-            }
-        }
-
-        // 3) Calculate totals per your rules
-        $total = 0.0;
-
-        // Youth: flat youth fee per student
-        $total += $youthCount * $this->youthFee;
-
-        // Regulars: first student full price, others discounted — but only if 2+ regulars
-        if ($regularCount >= 2) {
-            $total += $this->firstStudentFee;                         // one full
-            $total += ($regularCount - 1) * $this->secondStudentFee;  // rest discounted
-        } elseif ($regularCount === 1) {
-            $total += $this->firstStudentFee; // single regular: no discount even if there are youths
-        }
-        // if 0 regulars, nothing to add here
-
-        return $total;
-    }
-
-
-    // Method to check and generate an invoice when enrollment status changes
-    public function checkAndGenerateInvoice($parentId, $status)
-    {
-        if ($status == 'payment pending') {
-            $this->generateInvoice($parentId);
-        } elseif ($status == 'withdrawn' || $status == 'enrolled') {
-            $this->generateInvoice($parentId);
-        }
-    }
-
-    public function generatePdfInvoice($invoiceId)
-    {
-        $data = $this->prepareInvoiceData($invoiceId);
-        if (isset($data['error'])) {
-            return $this->generateErrorPdf($data['error']);
-        }
-
-        // Fetch discount_amount from discount_usages
-        $discountResult = $this->db->table('discount_usages du')
-            ->selectSum('du.discount_amount', 'total_discount')
-            ->join('invoices i', 'du.invoice_id = i.id')
-            ->where('du.invoice_id', $invoiceId)
-            ->where('i.school_year', $this->schoolYear)
-            ->get()
-            ->getRowArray();
-
-
-        $discountAmount = isset($discountResult['total_discount']) ? (float)$discountResult['total_discount'] : 0.00;
-
-        // Attach discount amount to data
-        $data['discount_amount'] = $discountAmount;
-
-        $this->renderPdfInvoice($data);
-    }
-
-    // Add this helper method in the same class (once)
-
-
-    private function prepareInvoiceData($invoiceId)
-    {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) {
-            return ['error' => "No invoice was generated. Please contact the school administration."];
-        }
-
-        $parentId   = $invoice['parent_id'];
-        $schoolYear = $invoice['school_year'];
-
-        // --- Payments ---
-        $db        = $this->db;
-        $table     = $this->paymentModel->table;
-        $hasStatus = $db->fieldExists('status', $table);
-        $hasVoid   = $db->fieldExists('is_void', $table);
-        $exclude   = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-
-        $qb = $this->paymentModel
-            ->where('parent_id', $parentId)
-            ->where('school_year', $schoolYear)
-            ->where('invoice_id', $invoiceId);
-
-        if ($hasStatus) {
-            $qb->groupStart()
-                ->whereNotIn('status', $exclude)
-                ->orWhere('status IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($hasVoid) {
-            $qb->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        $payments = $qb->findAll();
-
-        $parent = $this->userModel->find($parentId);
-        if (!$parent) {
-            return ['error' => "Parent associated with the invoice was not found."];
-        }
-
-        $enrollments = $this->enrollmentModel
-            ->where('parent_id', $parentId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        if (empty($enrollments)) {
-            return ['error' => 'No enrollments found for this invoice.'];
-        }
-
-        $registeredKids = [];
-        $withdrawnKids  = [];
-
-        foreach ($enrollments as $enrollment) {
-            $student = $this->studentModel->find($enrollment['student_id']);
-            if (!$student) {
-                log_message('error', "Student not found for ID: {$enrollment['student_id']}");
-                continue;
-            }
-
-            $grade = $this->studentClassModel->getStudentGrade($student['id']);
-
-            $studentData = [
-                'student_id'        => $student['id'],
-                'student_firstname' => $student['firstname'],
-                'student_lastname'  => $student['lastname'],
-                'grade'             => $grade,
-                'tuition_fee'       => $enrollment['tuition_fee'] ?? 0,
-                'enrollment_status' => $enrollment['enrollment_status'],
-            ];
-
-            if (in_array($enrollment['enrollment_status'], ['enrolled', 'payment pending'], true)) {
-                $registeredKids[] = $studentData;
-            } elseif (in_array($enrollment['enrollment_status'], ['withdrawn', 'withdraw under review', 'refund pending'], true)) {
-                $withdrawnKids[] = $studentData;
-            } else {
-                log_message('info', "Skipping student ID {$student['id']} with status {$enrollment['enrollment_status']}");
-            }
-        }
-
-        $registeredKids = array_values(array_filter($registeredKids, function ($student) use ($schoolYear) {
-            $sid = (int)($student['student_id'] ?? 0);
-            return $sid > 0 && $this->studentClassModel->hasNonEventAssignment($sid, $schoolYear);
-        }));
-
-        $withdrawnKids = array_values(array_filter($withdrawnKids, function ($student) use ($schoolYear) {
-            $sid = (int)($student['student_id'] ?? 0);
-            return $sid > 0 && $this->studentClassModel->hasNonEventAssignment($sid, $schoolYear);
-        }));
-
-        usort($registeredKids, fn($a, $b) => $this->compareGrades($a['grade'], $b['grade']));
-        usort($withdrawnKids,  fn($a, $b) => $this->compareGrades($a['grade'], $b['grade']));
-
-        $tzName        = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-        $tz            = new \DateTimeZone($tzName);
-        $currentDate   = new \DateTimeImmutable('today', $tz);
-        $deadline      = new \DateTimeImmutable($this->refundDeadline, $tz);
-        $refundAllowed = $currentDate <= $deadline;
-
-        $studentCharges = [];
-        $regularCount   = 0;
-
-        /**
-         * Computes the fee for a student given numeric level and original grade name.
-         * - KG/K/Kindergarten are always treated as "regular".
-         * - Otherwise, "regular" means gradeLevel <= $this->gradeFee threshold.
-         */
-        $computeCharge = function (int $gradeLevel, string $gradeName) use (&$regularCount) {
-            $threshold = (int) $this->gradeFee;
-
-            // Force Kindergarten to be regular regardless of numeric mapping
-            $isRegular = $this->isKindergarten($gradeName) || ($gradeLevel > 0 && $gradeLevel <= $threshold);
-
-            if ($isRegular) {
-                $fee = ($regularCount === 0) ? $this->firstStudentFee : $this->secondStudentFee;
-                $regularCount++;
-                return $fee;
-            }
-            return $this->youthFee;
-        };
-
-        // Registered kids -> pay unit fee
-        foreach ($registeredKids as $student) {
-            $gradeName  = (string)$student['grade'];
-            $gradeLevel = $this->gradeLevelInt($gradeName);
-            $unitFee    = $computeCharge($gradeLevel, $gradeName);
-            $studentCharges[$student['student_id']] = ['unit_fee' => $unitFee, 'refund' => 0];
-        }
-
-        // Refund NOT allowed -> withdrawn students still owe unit fee
-        if (!$refundAllowed) {
-            foreach ($withdrawnKids as $student) {
-                $gradeName  = (string)$student['grade'];
-                $gradeLevel = $this->gradeLevelInt($gradeName);
-                $unitFee    = $computeCharge($gradeLevel, $gradeName);
-                $studentCharges[$student['student_id']] = ['unit_fee' => $unitFee, 'refund' => 0];
-            }
-        }
-
-        $eventsList = $this->chargesModel->getChargesWithEventInfo($parentId, $schoolYear);
-
-        // Attach SCHOOL IDs
-        $allKids    = array_merge($registeredKids, $withdrawnKids);
-        $studentIds = array_column($allKids, 'student_id');
-
-        $schoolIdMap = [];
-        if ($studentIds) {
-            $rows = $this->studentModel
-                ->select('id, school_id')
-                ->whereIn('id', $studentIds)
-                ->findAll();
-            foreach ($rows as $row) {
-                $schoolIdMap[(int)$row['id']] = $row['school_id'] ?? 'N/A';
-            }
-        }
-
-        $students = $allKids;
-        foreach ($students as $i => $s) {
-            $sid = (int)$s['student_id'];
-            $students[$i]['student_school_id'] = $schoolIdMap[$sid] ?? 'N/A';
-        }
-
-        $discounts = $this->discountUsageModel
-            ->where('invoice_id',  $invoiceId)
-            ->where('parent_id',   $parentId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        // Refunds PAID for this specific invoice (money returned to the parent)
-        $refundsPaidTotal = 0.0;
-        try {
-            $r = $this->db->table('refunds')
-                ->select('COALESCE(SUM(refund_paid_amount),0) AS tot')
-                ->where('invoice_id', $invoiceId)
-                ->where('school_year', $schoolYear)
-                ->whereIn('status', ['Partial','Paid'])
-                ->get()->getRowArray();
-            $refundsPaidTotal = (float)($r['tot'] ?? 0.0);
-        } catch (\Throwable $e) {
-            log_message('error', 'Failed to sum refunds for invoice ' . (int)$invoiceId . ': ' . $e->getMessage());
-        }
-
-        /* ============================================================
-     * ADDITIONAL CHARGES (itemized) for this invoice
-     *  - uses the additional_charges table for line items
-     *  - uses invoice.additional_charge as the authoritative total (Strategy B)
-     * ============================================================ */
-        $acRows = $this->additionalChargeModel
-            ->select('id, charge_type, title, description, amount, due_date, status, created_at')
-            ->where('invoice_id', $invoiceId)
-            ->where('status !=', 'void')
-            ->orderBy('created_at', 'ASC')
-            ->orderBy('id', 'ASC')
-            ->findAll();
-
-        $additionalChargeLines  = [];
-        $additionalChargesTotal = 0.0;
-
-        foreach ($acRows as $ac) {
-            $signed = (float)($ac['amount'] ?? 0);
-            $ctype  = strtolower((string)($ac['charge_type'] ?? ''));
-
-            if (in_array($ctype, ['deduct'], true) && $signed > 0) {
-                $signed = -$signed;
-            } elseif (in_array($ctype, ['add'], true) && $signed < 0) {
-                $signed = abs($signed);
-            }
-
-            $lineDate = !empty($ac['created_at'])
-                ? date('Y-m-d', strtotime($ac['created_at']))
-                : (!empty($invoice['created_at']) ? local_date($invoice['created_at'], 'Y-m-d') : local_date(utc_now(), 'Y-m-d'));
-
-            $typeLabel = in_array($ctype, ['deduct'], true) ? 'Deduct' : 'Add';
-            $title     = ''; //trim((string)($ac['title'] ?? 'Additional Charge'));
-            $desc      = $typeLabel . ': ';
-
-            if (!empty($ac['description'])) {
-                $desc = $ac['description'];
-            }
-
-            $additionalChargesTotal += $signed;
-
-            $additionalChargeLines[] = [
-                'date'        => $lineDate,
-                'description' => $desc,
-                'amount'      => $signed,
-                'meta'        => [
-                    'id'       => (int)$ac['id'],
-                    'due_date' => $ac['due_date'] ?? null,
-                    'status'   => (string)($ac['status'] ?? ''),
-                    'type'     => $ctype,
-                ],
-            ];
-        }
-
-        $additionalChargesTotal = round($additionalChargesTotal, 2);
-
-        return [
-            'invoice'                => $invoice,
-            'parent'                 => $parent,
-            'registeredKids'         => $registeredKids,
-            'withdrawnKids'          => $withdrawnKids,
-            'studentCharges'         => $studentCharges,
-            'events'                 => $eventsList,
-            'students'               => $students,
-            'payments'               => $payments,
-            'discounts'              => $discounts,
-            'additionalChargesTotal' => $additionalChargesTotal,
-            'additionalChargeLines'  => $additionalChargeLines,
-            'refundsPaidTotal'       => $refundsPaidTotal,
-        ];
-    }
-
-
-    /**
-     * Treat common KG spellings as Kindergarten.
-     */
-    private function isKindergarten(string $grade): bool
-    {
-        $g = strtolower(trim($grade));
-        return in_array($g, ['KG', 'kg', 'k', 'kindergarten', 'k-g', 'k.g', 'k g'], true);
-    }
-
-
-    private function renderPdfInvoice($data)
-    {
-        // Unpack prepared data
-        extract($data);
-
-        // $data keys expected from prepareInvoiceData():
-        // - invoice, parent, registeredKids, withdrawnKids, studentCharges, events, students, payments, discounts
-        // - additionalChargeLines, additionalChargesTotal
-
-        $pdf = new class extends \FPDF {
-            function Footer()
-            {
-                $this->SetY(-15);
-                $this->SetFont('Arial', 'I', 8);
-                $this->Cell(0, 10, 'Page ' . $this->PageNo() . '/{nb}', 0, 0, 'C');
-            }
-        };
-
-        $pdf->AliasNbPages();
-        $pdf->AddPage();
-
-        // --- Column widths
-        $dateCell    = 30;
-        $descripCell = 130;
-        $amountCell  = 30;
-
-        // --- Header section
-        if (defined('FCPATH')) {
-            @$pdf->Image(FCPATH . 'images/logo.png',       170, 8, 30);
-            @$pdf->Image(FCPATH . 'images/Isgl_logo.png',   10, 8, 30);
-        }
-        $pdf->Ln(25);
-        $pdf->SetFont('Arial', 'B', 18);
-        $pdf->Cell(0, 10, 'Al Rahma Sunday School', 0, 1, 'C');
-        $pdf->SetFont('Arial', 'B', 18);
-        $pdf->Cell(0, 10, 'Invoice', 0, 1, 'C');
-        $pdf->Ln(15);
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell(40, 6, 'Parent Name:', 0, 0, 'L');
-        $pdf->SetFont('Arial', '', 12);
-        $pdf->Cell(0, 6, ($parent['firstname'] ?? '') . ' ' . ($parent['lastname'] ?? ''), 0, 1, 'L');
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell(40, 6, 'Invoice Date:', 0, 0, 'L');
-        $pdf->SetFont('Arial', '', 12);
-        $issueLocal = null;
-        try {
-            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-            if (!empty($invoice['issue_date'])) {
-                $issueLocal = (new \DateTimeImmutable($invoice['issue_date'], new \DateTimeZone('UTC')))
-                    ->setTimezone(new \DateTimeZone($tzName));
-            } elseif (!empty($invoice['created_at'])) {
-                $issueLocal = new \DateTimeImmutable($invoice['created_at'], new \DateTimeZone($tzName));
-            }
-        } catch (\Throwable $e) {}
-        if (!$issueLocal) { $issueLocal = new \DateTimeImmutable('now', new \DateTimeZone($tzName ?? 'UTC')); }
-        $pdf->Cell(0, 6, $issueLocal->format('m-d-Y'), 0, 1, 'L');
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell(40, 6, 'Invoice Number:', 0, 0, 'L');
-        $pdf->SetFont('Arial', '', 12);
-        $pdf->Cell(0, 6, (string)($invoice['invoice_number'] ?? ''), 0, 1, 'L');
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell(40, 6, 'Due Date:', 0, 0, 'L');
-        $pdf->SetFont('Arial', '', 12);
-        $dueLocal = null;
-        try {
-            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-            if (!empty($invoice['due_date'])) {
-                $dueLocal = (new \DateTimeImmutable($invoice['due_date'], new \DateTimeZone('UTC')))
-                    ->setTimezone(new \DateTimeZone($tzName));
-            } elseif (!empty($invoice['created_at'])) {
-                $dueLocal = new \DateTimeImmutable($invoice['created_at'], new \DateTimeZone($tzName));
-            }
-        } catch (\Throwable $e) {}
-        if (!$dueLocal) { $dueLocal = new \DateTimeImmutable('now', new \DateTimeZone($tzName ?? 'UTC')); }
-        $pdf->Cell(0, 6, $dueLocal->format('m-d-Y'), 0, 1, 'L');
-
-        $pdf->Ln(5);
-        $pdf->SetFont('Arial', '', 9);
-        $pdf->MultiCell(0, 5, "Please make the payment by the due date mentioned above. For any queries regarding this invoice, contact the school administration at alrahma.isgl@gmail.com or call +1 978-364-0219.");
-        $pdf->Ln(4);
-
-        // --- Table header
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell($dateCell, 7, 'Date', 1, 0);
-        $pdf->Cell($descripCell, 7, 'Description', 1);
-        $pdf->Cell($amountCell, 7, 'Amount', 1, 1, 'R');
-
-        // --- Additional charges data presence
-        $additionalChargeLines  = $data['additionalChargeLines']  ?? [];
-        $additionalChargesTotal = (float)($data['additionalChargesTotal'] ?? 0.0);
-        $hasAdditional          = abs($additionalChargesTotal) > 0.00001;
-
-        // --- Helpers for robust date handling & row pushing ---
-        $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-        $tz = new \DateTimeZone($tzName);
-
-        /**
-         * Normalize a raw date string to configured/user local timezone.
-         * @param ?string $raw
-         * @param bool $assumeUtc If true, treat $raw as UTC and convert; if false, parse as local.
-         */
-        $toLocal = function (?string $raw, bool $assumeUtc = false) use ($tz): \DateTimeImmutable {
-            $fallback = new \DateTimeImmutable('now', $tz);
-            if (!$raw) return $fallback;
-
-            try {
-                if ($assumeUtc) {
-                    $dt = new \DateTimeImmutable($raw, new \DateTimeZone('UTC'));
-                    return $dt->setTimezone($tz);
-                }
-                // Parse directly with local tz; PHP will interpret Y-m-d and Y-m-d H:i:s fine here
-                $dt = new \DateTimeImmutable($raw, $tz);
-                return $dt;
-            } catch (\Throwable $e) {
-                $ts = @strtotime($raw);
-                if ($ts === false) return $fallback;
-                return (new \DateTimeImmutable('@' . $ts))->setTimezone($tz);
-            }
-        };
-
-        $transactions  = [];
-        $totalPaid     = 0.0;
-        $totalDiscount = 0.0;
-        $seq = 0; // stable tie-breaker to preserve insertion order for identical timestamps
-
-        $push = function (\DateTimeImmutable $dt, string $desc, float $amount, string $category = 'other') use (&$transactions, &$seq) {
-            $transactions[] = [
-                'dt'          => $dt,
-                'description' => $desc,
-                'amount'      => $amount,
-                'cat'         => $category,
-                'seq'         => $seq++,
-            ];
-        };
-
-        // --- Tuition/registration lines (charges) ---
-        foreach ($registeredKids as $student) {
-            $id   = $student['student_id'];
-            $unit = (float)($studentCharges[$id]['unit_fee'] ?? 0.0);
-            $name = $student['student_firstname'] . ' ' . $student['student_lastname'];
-
-            $classSectionName = $this->classSectionModel->getClassSectionNameByClassId($student['grade']);
-            $lowerCaseName = strtolower((string)$classSectionName);
-            $gradeName = ($lowerCaseName === 'kg')
-                ? 'in Kindergarten '
-                : (($lowerCaseName === 'youth') ? 'in Youth ' : ('in Grade ' . $classSectionName));
-
-            $dt = $toLocal($invoice['created_at'] ?? null, false);
-            $push($dt, 'Registration of student "' . $name . '" ' . $gradeName, $unit, 'registration');
-        }
-
-        // --- Event charges (charges) ---
-        foreach ($events as $event) {
-            $studentName = 'N/A';
-            if (!empty($event['student_id'])) {
-                foreach ($students as $st) {
-                    if (($st['student_id'] ?? null) == $event['student_id']) {
-                        $studentName = $st['student_firstname'] . ' ' . $st['student_lastname'];
-                        break;
-                    }
-                }
-            }
-
-            $dt        = $toLocal($event['created_at'] ?? null, false);
-            $amount    = (float)($event['charged'] ?? 0.0);
-            $eventName = !empty($event['event_name']) ? $event['event_name'] : 'with no name';
-
-            $push($dt, 'Event ' . $eventName . ' charge for "' . $studentName . '"', $amount, 'event');
-        }
-
-        // --- Withdrawn refunds (negative) — only if a non-zero refund figure exists
-        foreach ($withdrawnKids as $student) {
-            $id   = $student['student_id'];
-            $ref  = (float)($studentCharges[$id]['refund'] ?? 0.0);
-            if ($ref <= 0) { continue; }
-            $name = $student['student_firstname'] . ' ' . $student['student_lastname'];
-
-            $dt = $toLocal($invoice['created_at'] ?? null, false);
-            $push($dt, 'Refund for student "' . $name . '"', -1 * $ref, 'refund');
-        }
-
-        // --- Payments (negative) — stored in local time
-        foreach ($payments as $payment) {
-            $dt     = $toLocal($payment['payment_date'] ?? null, false /* local */);
-            $amount = (float)($payment['paid_amount'] ?? 0.0);
-            $totalPaid += $amount;
-            $push($dt, 'Payment (' . ($payment['payment_method'] ?? 'Payment') . ')', -1 * $amount, 'payment');
-        }
-
-        // --- Additional charges (already signed: deduct < 0, add > 0)
-        foreach ($additionalChargeLines as $l) {
-            $dt   = $toLocal($l['date'] ?? null, false);
-            $desc = (string)($l['description'] ?? 'Additional Charge');
-            $amt  = (float)($l['amount'] ?? 0.0);
-            $push($dt, $desc, $amt, 'additional');
-        }
-
-        // --- Discounts (negative) integrated into the timeline
-        foreach (($discounts ?? []) as $discount) {
-            $amt = (float)($discount['discount_amount'] ?? 0.0);
-            $totalDiscount += $amt;
-
-            $dt   = $toLocal($discount['used_at'] ?? ($invoice['created_at'] ?? null), false);
-            $desc = "Discount applied (Reason: {$discount['description']})";
-            $push($dt, $desc, -1 * $amt, 'discount');
-        }
-
-        // --- Sort by exact timestamp, then by insertion sequence for stability
-        usort($transactions, function ($a, $b) {
-            // Different days: keep chronological by timestamp
-            $dayA = $a['dt']->format('Y-m-d');
-            $dayB = $b['dt']->format('Y-m-d');
-            if ($dayA !== $dayB) {
-                return $a['dt'] <=> $b['dt'];
-            }
-
-            // Same day: ensure desired category priority (registration before payment)
-            $pri = [
-                'registration' => 10,
-                'event'        => 20,
-                'additional'   => 25,
-                'discount'     => 30,
-                'refund'       => 40,
-                'payment'      => 90,
-                'other'        => 50,
-            ];
-            $ca = $a['cat'] ?? 'other';
-            $cb = $b['cat'] ?? 'other';
-            $pa = $pri[$ca] ?? 50;
-            $pb = $pri[$cb] ?? 50;
-            if ($pa !== $pb) {
-                return $pa <=> $pb;
-            }
-
-            // Same category: fall back to exact timestamp, then insertion order
-            $cmp = $a['dt'] <=> $b['dt'];
-            return $cmp !== 0 ? $cmp : ($a['seq'] <=> $b['seq']);
-        });
-
-        // --- Render transactions (strict chronological order)
-        $pdf->SetFont('Arial', '', 11);
-        foreach ($transactions as $t) {
-            $pdf->Cell($dateCell,    7, $t['dt']->format('m-d-Y'), 1);
-            $pdf->Cell($descripCell, 7, $t['description'],         1);
-            $pdf->Cell($amountCell,  7, ($t['amount'] < 0 ? '-$' : '$') . number_format(abs($t['amount']), 2), 1, 1, 'R');
-        }
-
-        // ======== SUMMARY (bottom) ========
-        // Compute total charges from components (tuition + event charges + additional charges)
-        // to ensure the PDF always reflects all elements accurately.
-        $tuitionSubtotal = 0.0;
-        foreach (($studentCharges ?? []) as $sc) {
-            $tuitionSubtotal += (float)($sc['unit_fee'] ?? 0.0);
-        }
-
-        $eventSubtotal = 0.0;
-        foreach (($events ?? []) as $ev) {
-            $eventSubtotal += (float)($ev['charged'] ?? 0.0);
-        }
-
-        $additionalSubtotal = (float)($additionalChargesTotal ?? 0.0);
-
-        $totalRefund  = (float)($data['refundsPaidTotal'] ?? 0.0);
-        $totalAmount  = round($tuitionSubtotal + $eventSubtotal + $additionalSubtotal, 2);
-        $calcBalance  = $totalAmount - $totalPaid - $totalDiscount - $totalRefund;
-        // Prefer computed balance in PDF to avoid stale DB values
-        $totalBalance = $calcBalance;
-
-        // Display rule: if negative, show as Credit (Overpayment) and clamp balance due to 0.00
-        $displayBalance  = $totalBalance;
-        $creditOverpay   = 0.0;
-        if ($displayBalance < -0.00001) {
-            $creditOverpay  = abs($displayBalance);
-            $displayBalance = 0.00;
-        }
-
-        $pdf->Ln(5);
-        $labelWidth  = 165;
-        $amountWidth = 25;
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell($labelWidth, 7, 'Total Charges:', 0, 0, 'R');
-        $pdf->SetFont('Arial', '', 12);
-        $pdf->Cell($amountWidth, 7, '$' . number_format($totalAmount, 2), 0, 1, 'R');
-
-        // Show Additional Charges subtotal if any (informational)
-        if ($hasAdditional) {
-            $pdf->SetFont('Arial', 'B', 12);
-            $pdf->Cell($labelWidth, 7, 'Additional Charges (included):', 0, 0, 'R');
-            $pdf->SetFont('Arial', '', 12);
-            $pdf->Cell($amountWidth, 7, '$' . number_format($additionalChargesTotal, 2), 0, 1, 'R');
-        }
-
-        if ($totalDiscount > 0.0) {
-            $pdf->SetFont('Arial', 'B', 12);
-            $pdf->Cell($labelWidth, 7, 'Total Discount:', 0, 0, 'R');
-            $pdf->SetFont('Arial', '', 12);
-            $pdf->Cell($amountWidth, 7, '$' . number_format($totalDiscount, 2), 0, 1, 'R');
-        }
-
-        if ($totalRefund > 0.0) {
-            $pdf->SetFont('Arial', 'B', 12);
-            $pdf->Cell($labelWidth, 7, 'Refunds Paid:', 0, 0, 'R');
-            $pdf->SetFont('Arial', '', 12);
-            $pdf->Cell($amountWidth, 7, '$' . number_format($totalRefund, 2), 0, 1, 'R');
-        }
-
-        // Show credit if overpaid
-        if ($creditOverpay > 0.0) {
-            $pdf->SetFont('Arial', 'B', 12);
-            $pdf->Cell($labelWidth, 7, 'Credit (Overpayment):', 0, 0, 'R');
-            $pdf->SetFont('Arial', '', 12);
-            $pdf->Cell($amountWidth, 7, '$' . number_format($creditOverpay, 2), 0, 1, 'R');
-        }
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell($labelWidth, 7, 'Total Paid:', 0, 0, 'R');
-        $pdf->SetFont('Arial', '', 12);
-        $pdf->Cell($amountWidth, 7, '$' . number_format($totalPaid, 2), 0, 1, 'R');
-
-        $pdf->SetFont('Arial', 'B', 12);
-        $pdf->Cell($labelWidth, 7, 'Balance Due:', 0, 0, 'R');
-        $pdf->SetFont('Arial', '', 12);
-        $pdf->Cell($amountWidth, 7, '$' . number_format($displayBalance, 2), 0, 1, 'R');
-
-        // --- Output
-        header('Content-Type: application/pdf');
-        header('Content-Disposition: inline; filename="invoice_' . ($invoice['invoice_number'] ?? 'N/A') . '.pdf"');
-        header('Cache-Control: private, max-age=0, must-revalidate');
-
-        $pdf->Output('I', 'invoice_' . ($invoice['invoice_number'] ?? 'N/A') . '.pdf');
-        exit;
-    }
-
-    // --- Grade helpers ---
-    private function compareGrades($gradeA, $gradeB)
-    {
-        $valA = $this->getGradeLevel($gradeA);
-        $valB = $this->getGradeLevel($gradeB);
-
-        // First compare numeric levels
-        if ($valA['level'] !== $valB['level']) {
-            return $valA['level'] <=> $valB['level'];
-        }
-
-        // Same level, compare suffix lexicographically (A < B)
-        return strcmp($valA['suffix'] ?? '', $valB['suffix'] ?? '');
-    }
-
-    private function gradeLevelInt($grade): int
-    {
-        $gl = $this->getGradeLevel($grade);
-        return (int) ($gl['level'] ?? 0);
-    }
-
-    /**
-     * Robust grade parser. Returns ['level' => int, 'suffix' => string]
-     * Examples:
-     *  - 'PK' => -1, 'K'/'Kindergarten' => 0
-     *  - '1', '2A', 'Grade 5', 'G5' => 1,2,5
-     *  - 'Y', 'Youth', 'Y1', 'Youth 2' => map to > 9 (10, 11, 12 ...)
-     */
-private function getGradeLevel($grade): array
-{
-    // Normalize
-    if (is_numeric($grade)) {
-        $num = (int)$grade;
-        if ($num === 13) {
-            // KG special case
-            return ['level' => 1, 'suffix' => '', 'classId' => 13];
-        }
-        // If you want, you could also handle Pre-K or Youth by number here
-        return ['level' => $num, 'suffix' => '', 'classId' => null];
-    }
-
-    if (!is_string($grade)) {
-        return ['level' => 999, 'suffix' => '', 'classId' => null];
-    }
-
-    $g = strtoupper(trim($grade));
-    $g = preg_replace('/\s+/', ' ', $g);
-    $g = str_replace(['.', '_'], '', $g);
-    $g = str_replace('-', ' ', $g);
-
-    // Kindergarten (string forms)
-    $kg = ['K', 'KG', 'K G', 'KINDER', 'KINDERGARTEN'];
-    if (in_array($g, $kg, true)) {
-        return ['level' => 1, 'suffix' => '', 'classId' => 13];
-    }
-
-    // Pre-K
-    $pk = ['PK', 'P K', 'PREK', 'PRE K', 'PRE-K', 'PRE KINDER', 'PREKINDER'];
-    if (in_array($g, $pk, true)) {
-        return ['level' => -1, 'suffix' => '', 'classId' => null];
-    }
-
-    // Youth: Y, YOUTH, Y1, YOUTH2, etc.
-    if (preg_match('/^Y(?:OUTH)?(?:\s*(\d+))?$/', $g, $m)) {
-        $n = isset($m[1]) && $m[1] !== '' ? max(1, (int)$m[1]) : 1;
-        return [
-            'level'  => (int)$this->gradeFee + $n,
-            'suffix' => '',
-            'classId'=> null
-        ];
-    }
-
-    // Numeric grades like "5", "GRADE 5", "G5", "5A"
-    if (preg_match('/^(?:GR?ADE\s*)?(\d{1,2})\s*([A-Z]*)$/', $g, $m)) {
-        return [
-            'level'  => (int) $m[1],
-            'suffix' => $m[2] ?? '',
-            'classId'=> null
-        ];
-    }
-
-    return ['level' => 999, 'suffix' => '', 'classId' => null];
-}
-
-    private function generateErrorPdf($message)
-    {
-        // Create a new instance of FPDF
-        $pdf = new \FPDF();
-        $pdf->AddPage();
-
-        // Set title
-        $pdf->SetFont('Arial', 'B', 16);
-        $pdf->Cell(0, 10, 'Error', 0, 1, 'C');  // Add the error title centered
-
-        // Set message font and size
-        $pdf->SetFont('Arial', '', 12);
-        $pdf->Ln(10);  // Add a line break
-
-        // Add the message to the PDF
-        $pdf->MultiCell(0, 10, $message);  // Allow the message to wrap in multiple lines
-
-        // Output the PDF
-        $pdf->Output('I', 'error.pdf');  // Output PDF inline (browser)
-    }
-
-    public function invoicePayment()
-    {
-        $parentId = session()->get('user_id');
-
-        if (!$parentId) {
-            return redirect()->back()->with('error', 'Unable to retrieve student data. Please contact support.');
-        }
-
-        $currentSchoolYear = $this->schoolYear;
-
-        // Get available school years from invoices
-        $schoolYears = $this->invoiceModel
-            ->select('school_year')
-            ->distinct()
-            ->where('parent_id', $parentId)
-            ->orderBy('school_year', 'DESC')
-            ->findAll();
-
-        // Determine which year to show
-        $selectedYear = $this->request->getGet('school_year');
-
-        if (empty($selectedYear)) {
-            $hasCurrentYear = in_array($currentSchoolYear, array_column($schoolYears, 'school_year'));
-            $selectedYear = $hasCurrentYear ? $currentSchoolYear : (!empty($schoolYears) ? $schoolYears[0]['school_year'] : null);
-        }
-
-        // Fetch invoices for the selected year
-        $invoices = [];
-        if ($selectedYear) {
-            $invoices = $this->invoiceModel->getInvoicesByParentId($parentId, $selectedYear);
-        }
-
-        // Fetch refund amounts PAID for these invoices
-        $invoiceIds = array_column($invoices, 'id');
-        $refunds = [];
-        if (!empty($invoiceIds)) {
-            $refundResults = $this->db->table('refunds')
-                ->select('invoice_id, COALESCE(SUM(refund_paid_amount),0) as refund_paid_amount')
-                ->whereIn('invoice_id', $invoiceIds)
-                ->whereIn('status', ['Partial','Paid'])
-                ->groupBy('invoice_id')
-                ->get()
-                ->getResultArray();
-
-            foreach ($refundResults as $row) {
-                $refunds[$row['invoice_id']] = $row['refund_paid_amount'];
-            }
-        }
-
-        // Fetch last payment data for these invoices
-        $lastPayments = [];
-        if (!empty($invoiceIds)) {
-            $paymentResults = $this->paymentModel->getPaymentsByInvoice($invoiceIds);
-
-            foreach ($paymentResults as $payment) {
-                $lastPayments[$payment['invoice_id']] = [
-                    'last_paid_amount'  => $payment['last_paid_amount'],
-                    'last_payment_date' => $payment['last_payment_date']
-                ];
-            }
-        }
-
-        // Attach refund amount and last payment data to each invoice
-        foreach ($invoices as &$invoice) {
-            $invoice['refund_amount'] = $refunds[$invoice['id']] ?? 0.00;
-            $invoice['last_paid_amount'] = $lastPayments[$invoice['id']]['last_paid_amount'] ?? 0.00;
-            $invoice['last_payment_date'] = $lastPayments[$invoice['id']]['last_payment_date'] ?? null;
-        }
-
-        return view('/parent/invoice_payment', [
-            'invoices' => $invoices,
-            'schoolYears' => $schoolYears,
-            'selectedYear' => $selectedYear,
-            'currentSchoolYear' => $currentSchoolYear,
-            'dueDate' => $this->dueDate
-        ]);
-    }
-
-    // API: Create a new invoice
-    public function createAPI()
-    {
-        $data = [
-            'parent_id' => $this->request->getPost('parent_id'),
-            'registeredKids' => $this->request->getPost('registeredKids'),
-            'invoice_number' => $this->request->getPost('invoice_number'),
-            'total_amount' => $this->request->getPost('total_amount'),
-            'refund_amount' => $this->request->getPost('refund_amount'),
-            'balance' => $this->request->getPost('balance'),
-            'school_year' => $this->request->getPost('school_year'),
-            'issue_date' => $this->request->getPost('issue_date'),
-            'refund_issue_date' => $this->request->getPost('refund_issue_date'),
-            'due_date' => $this->request->getPost('due_date'),
-            'status' => 'Unpaid',
-            'description' => $this->request->getPost('description'),
-        ];
-
-        if ($this->invoiceModel->save($data)) {
-            return $this->respondCreated($data); // Send successful response
-        } else {
-            return $this->failValidationErrors($this->invoiceModel->errors()); // Return validation errors
-        }
-    }
-
-    // API: Get invoices by parent ID
-    public function getByParentAPI($parentId)
-    {
-        $invoices = $this->invoiceModel->getInvoicesByUserId($parentId, $this->schoolYear);
-        if ($invoices) {
-            return $this->respond($invoices); // Send the invoices in the response
-        } else {
-            return $this->failNotFound('Invoices not found for the parent.');
-        }
-    }
-
-    // View: Get invoices by parent ID (for web views)
-    public function getByParent($parentId)
-    {
-        $invoices = $this->invoiceModel->getInvoicesByUserId($parentId, $this->schoolYear);
-        return view('invoice_list', ['invoices' => $invoices]);
-    }
-
-    // View: Create a new invoice
-    public function create()
-    {
-        return view('invoice_create');
-    }
-
-    // API: Update invoice status
-    public function updateStatusAPI($invoiceId)
-    {
-        $status = $this->request->getPost('status');
-        if ($this->invoiceModel->updateInvoiceStatus($invoiceId, $status)) {
-            return $this->respond(['status' => 'success']);
-        } else {
-            return $this->failNotFound('Invoice not found.');
-        }
-    }
-
-    // View: Update invoice status
-    public function updateStatus($invoiceId)
-    {
-        $status = $this->request->getPost('status');
-        if ($this->invoiceModel->updateInvoiceStatus($invoiceId, $status)) {
-            return redirect()->to('/invoices');
-        } else {
-            return redirect()->back()->with('error', 'Failed to update status.');
-        }
-    }
-
-    // View: Get unpaid invoices
-    public function unpaidInvoices()
-    {
-        $unpaidInvoices = $this->invoiceModel->getUnpaidInvoices();
-        return view('unpaid_invoices', ['invoices' => $unpaidInvoices]);
-    }
-}
diff --git a/app/Http/Controllers/old/MidtermController.php b/app/Http/Controllers/old/MidtermController.php
deleted file mode 100644
index 9d35f8ad..00000000
--- a/app/Http/Controllers/old/MidtermController.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\StudentClassModel;
-use App\Models\StudentModel;
-use App\Models\MidtermExamModel;
-use App\Models\ConfigurationModel;
-use RuntimeException;
-use App\Services\SemesterScoreService;
-use Config\Services;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-
-class MidtermController extends BaseController
-{
-    protected $db;
-    protected $semesterScoreService;
-    protected $schoolYear;  // Declare global variable for the controller
-    protected $semester;
-    protected $configModel;
-    protected $studentModel;
-    protected $teacherClassModel;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-
-        $this->configModel = new ConfigurationModel();
-        $this->studentModel      = new StudentModel();
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->semesterScoreService = service('semesterScoreService');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-    }
-
-    public function add()
-    {
-        // 1) class_section_id from the view (POST/GET) with session fallback
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-
-        // (optional) persist for downstream use
-        session()->set('class_section_id', $classSectionId);
-
-        // (optional) access check if you restrict by teacher assignments
-        // if (!$this->canAccessClassSection((int)(session()->get('user_id') ?? 0), $classSectionId)) {
-        //     return redirect()->back()->with('status', 'You do not have access to that class section.');
-        // }
-
-        $semester = $this->getSelectedSemesterFromRequest();
-        $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-        try {
-            $result = $this->getSavedScores($classSectionId, $semester, $schoolYear);
-            $missingOkMap = $this->missingScoreOverrideModel->getOverridesMap($classSectionId, $semester, $schoolYear, 'midterm_exam');
-
-            return view('teacher/add_midterm_exam', [
-                'students'       => $result['students'],
-                'semester'       => $result['semester'],
-                'schoolYear'     => $result['schoolYear'],
-                'classSectionId' => $classSectionId,
-                'missingOkMap'   => $missingOkMap,
-            ]);
-        } catch (\Throwable $e) {
-            return redirect()->back()->with('status', $e->getMessage());
-        }
-    }
-
-
-
-    public function update()
-    {
-        $updatedBy = session()->get('user_id');
-        $scores          = $this->request->getPost('final_score');
-        $classSectionId  = session()->get('class_section_id');
-
-        if (!is_array($scores)) {
-            return redirect()->back()->with('error', 'No scores submitted.');
-        }
-
-        $semester = $this->getSelectedSemesterFromRequest();
-        $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-        $this->saveExamScores('midterm_exam', $scores, $updatedBy, $classSectionId, $semester, $schoolYear);
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-        $studentIds = array_keys($scores);
-        $checkedItems = [];
-        if (is_array($missingOk)) {
-            foreach ($missingOk as $studentId => $flags) {
-                $checkedItems[] = [
-                    'student_id' => (int) $studentId,
-                    'item_index' => null,
-                ];
-            }
-        }
-        $this->missingScoreOverrideModel->replaceOverrides(
-            $classSectionId,
-            (string) $semester,
-            (string) $schoolYear,
-            'midterm_exam',
-            $studentIds,
-            null,
-            $checkedItems,
-            $updatedBy,
-            true
-        );
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-
-        return redirect()->to(base_url('/teacher/addMidtermExam'))
-            ->with('status', 'Midterm exam scores updated successfully.');
-    }
-
-    public function updateMngt()
-    {
-        $scores          = $this->request->getPost('final_score');
-        $updatedBy       = $this->request->getPost('teacher_id') ?? session()->get('user_id'); // default to session user
-        $classSectionId  = session()->get('class_section_id');
-
-        if (!is_array($scores)) {
-            return redirect()->back()->with('error', 'No scores submitted.');
-        }
-
-        $semester = $this->getSelectedSemesterFromRequest();
-        $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-        $this->saveExamScores('midterm_exam', $scores, $updatedBy, $classSectionId, $semester, $schoolYear);
-
-        session()->setFlashdata('status', 'Midterm exam scores updated successfully.');
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        // ⬇️ Directly call the method and return its view
-        return $this->showMidtermMngt();
-    }
-
-
-    public function showMidtermMngt()
-    {
-        // 1) Get class_section_id from POST -> GET -> session
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-
-        try {
-            // 2) Load roster + saved scores for this class/term
-            $semester = $this->getSelectedSemesterFromRequest();
-            $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-            $result = $this->getSavedScores($classSectionId, $semester, $schoolYear);
-            $scoresLocked = $this->isScoresLocked($classSectionId, $semester, $schoolYear);
-
-            // 3) Render view (no teacherId anymore)
-            return view('grading/midterm', [
-                'students'        => $result['students'],
-                'semester'        => $result['semester'],
-                'schoolYear'      => $result['schoolYear'],
-                'classSectionId'  => $classSectionId,
-                'scoresLocked'    => $scoresLocked,
-            ]);
-        } catch (\Throwable $e) {
-            return redirect()->back()->with('status', $e->getMessage());
-        }
-    }
-
-    private function isScoresLocked(int $classSectionId, string $semester, string $schoolYear): bool
-    {
-        return $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-    }
-
-
-
-    private function saveExamScores(string $table, array $scores, int $updatedBy, int $classSectionId, string $semester, string $schoolYear): void
-    {
-        $builder = $this->db->table($table);
-        $now = utc_now();
-
-        foreach ($scores as $studentId => $data) {
-            if (!is_numeric($studentId) || !isset($data['score'])) {
-                continue;
-            }
-
-            $score = is_numeric($data['score']) ? (float) $data['score'] : null;
-
-            $existing = $builder
-                ->where('student_id', $studentId)
-                ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->get()
-                ->getRow();
-
-            $dataToSave = [
-                'student_id'       => $studentId,
-                'class_section_id' => $classSectionId,
-                'updated_by'       => $updatedBy,
-                'score'            => $score,
-                'semester'         => $semester,
-                'school_year'      => $schoolYear,
-                'updated_at'       => $now,
-            ];
-
-            if ($existing) {
-                $builder->where('id', $existing->id)->update($dataToSave);
-            } else {
-                $dataToSave['created_at'] = $now;
-                $builder->insert($dataToSave);
-            }
-        }
-    }
-
-    /**
-     * Get roster + saved midterm scores for a specific classSection/term.
-     */
-    private function getSavedScores(int $classSectionId, string $semester, string $schoolYear): array
-    {
-        if ($classSectionId <= 0) {
-            throw new \InvalidArgumentException('Invalid class section id.');
-        }
-
-        session()->set('class_section_id', $classSectionId);
-
-        // Subquery: pick ONE midterm row per student (latest by id).
-        // If your table doesn't have 'id', swap to MAX(updated_at) or MAX(exam_date).
-        $latestMidtermSub = $this->db->table('midterm_exam')
-            ->select('student_id, MAX(id) AS max_id')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->groupBy('student_id')
-            ->getCompiledSelect();
-
-        // Main query: roster for this class/term + LEFT JOIN the single midterm row
-        $qb = $this->studentModel
-            ->select('
-            s.id AS student_id,
-            s.school_id,
-            s.firstname,
-            s.lastname,
-            me.score
-        ')
-            ->from('students s')
-            ->join(
-                'student_class sc',
-                'sc.student_id = s.id
-             AND sc.class_section_id = ' . (int) $classSectionId . '
-             AND sc.school_year = ' . $this->db->escape($schoolYear),
-                'inner',
-                false
-            )
-            // Join the "latest midterm per student" subquery, then the actual midterm row
-            ->join('(' . $latestMidtermSub . ') ml', 'ml.student_id = s.id', 'left', false)
-            ->join('midterm_exam me', 'me.id = ml.max_id', 'left')
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC');
-
-        // DISTINCT protects against rare duplicate sc rows that match the same select columns
-        $qb->distinct();
-
-        $rows = $qb->get()->getResultArray();
-
-        // Final safety net: ensure one row per student_id
-        $unique = [];
-        foreach ($rows as $r) {
-            $unique[(int)$r['student_id']] = $r;
-        }
-        $students = array_values($unique);
-
-        return [
-            'students'   => $students,
-            'semester'   => $semester,
-            'schoolYear' => $schoolYear,
-        ];
-    }
-
-    private function getTeacherSelectedSemester(): string
-    {
-        helper('semester_selection_helper');
-        return selected_teacher_semester();
-    }
-
-    private function getSelectedSemesterFromRequest(): string
-    {
-        $semesterParam = $this->request->getPost('semester')
-            ?? $this->request->getGet('semester')
-            ?? $this->request->getGet('filter');
-        $normalized = $this->normalizeSemesterSelection($semesterParam);
-        if ($normalized !== '') {
-            $label = ucfirst($normalized);
-            $session = session();
-            $session->set('teacher_scores_selected_semester', $label);
-            $session->set('semester', $label);
-        }
-
-        return $this->getTeacherSelectedSemester();
-    }
-
-    private function getSelectedSchoolYearFromRequest(): ?string
-    {
-        $yearParam = $this->request->getPost('school_year') ?? $this->request->getGet('school_year');
-        return $this->normalizeSchoolYear($yearParam);
-    }
-
-    private function normalizeSemesterSelection(?string $input): string
-    {
-        $value = strtolower(trim((string) $input));
-        if ($value === 'fall' || str_contains($value, '1')) {
-            return 'fall';
-        }
-        if ($value === 'spring' || str_contains($value, '2')) {
-            return 'spring';
-        }
-        return '';
-    }
-
-    private function normalizeSchoolYear(?string $input): ?string
-    {
-        $value = trim((string) $input);
-        if ($value === '') {
-            return null;
-        }
-        if (preg_match('/^\\d{4}\\s*[-\\/]\\s*\\d{4}$/', $value)) {
-            return preg_replace('/\\s+/', '', str_replace('/', '-', $value));
-        }
-        return null;
-    }
-}
diff --git a/app/Http/Controllers/old/NavbarService.php b/app/Http/Controllers/old/NavbarService.php
new file mode 100644
index 00000000..183184b1
--- /dev/null
+++ b/app/Http/Controllers/old/NavbarService.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\NavItemModel;
+use App\Models\RoleNavItemModel;
+use CodeIgniter\Cache\CacheInterface;
+
+class NavbarService
+{
+    public function __construct(
+        protected NavItemModel $navModel = new NavItemModel(),
+        protected RoleNavItemModel $mapModel = new RoleNavItemModel(),
+        protected ?CacheInterface $cache = null
+    ){
+        $this->cache ??= cache();
+    }
+
+    public function getMenuForRoles(array $roles): array
+    {
+        $roles = array_map(fn($r)=>strtolower(trim((string)$r)), $roles);
+        $cacheKey = 'navbar_' . md5(json_encode($roles));
+
+        if ($menu = $this->cache->get($cacheKey)) {
+            return $menu;
+        }
+
+        // Which items this user can see
+        $allowedIds = $this->mapModel->getNavItemIdsForRoles($roles);
+        if (empty($allowedIds)) return [];
+
+        // Load all enabled items, then filter
+        $rows = $this->navModel->where('is_enabled', 1)
+            ->orderBy('sort_order', 'ASC')
+            ->findAll();
+
+        // index by id
+        $byId = [];
+        foreach ($rows as $r) {
+            if (in_array($r['id'], $allowedIds, true)) {
+                $r['children'] = [];
+                $byId[$r['id']] = $r;
+            }
+        }
+
+        // Build tree
+        $tree = [];
+        foreach ($byId as $id => &$node) {
+            $pid = $node['menu_parent_id'];
+            if ($pid && isset($byId[$pid])) {
+                $byId[$pid]['children'][] = &$node;
+            } else {
+                $tree[] = &$node;
+            }
+        }
+
+        $this->cache->save($cacheKey, $tree, 300); // 5 minutes
+        return $tree;
+    }
+
+    public function clearCache(): void
+    {
+        // simplest: flush; or if you have a tagged cache, clear only keys
+        cache()->clean();
+    }
+}
diff --git a/app/Http/Controllers/old/NotificationService.php b/app/Http/Controllers/old/NotificationService.php
new file mode 100644
index 00000000..1388041f
--- /dev/null
+++ b/app/Http/Controllers/old/NotificationService.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Services;
+
+use CodeIgniter\Events\Events;
+
+class NotificationService
+{
+    /**
+     * Trigger a notification event by type and payload.
+     *
+     * @param string $eventType  The name of the event (e.g., 'userRegistered')
+     * @param array  $payload    The data to pass to the listener
+     * @return void
+     */
+    public static function trigger(string $eventType, array $payload): void
+    {
+        Events::trigger($eventType, $payload);
+    }
+
+    /**
+     * Helper for sending to a specific user.
+     *
+     * @param int    $userId
+     * @param string $title
+     * @param string $message
+     * @param array  $channels
+     * @return void
+     */
+    public static function toUser(int $userId, string $title, string $message, array $channels = ['in_app']): void
+    {
+        self::trigger('customNotification', [
+            'user_id'  => $userId,
+            'title'    => $title,
+            'message'  => $message,
+            'channels' => $channels
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/old/ParticipationController.php b/app/Http/Controllers/old/ParticipationController.php
deleted file mode 100644
index 5b0e52ce..00000000
--- a/app/Http/Controllers/old/ParticipationController.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\StudentClassModel;
-use App\Models\StudentModel;
-use App\Models\ParticipationModel;
-use App\Models\ConfigurationModel;
-use RuntimeException;
-use App\Services\SemesterScoreService;
-use Config\Services;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-
-class ParticipationController extends BaseController
-{
-    protected $db;
-    protected $semesterScoreService;
-    protected $schoolYear;  // Declare global variable for the controller
-    protected $semester;
-    protected $configModel;
-    protected $studentModel;
-    protected $teacherClassModel;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-
-        $this->configModel = new ConfigurationModel();
-        $this->studentModel      = new StudentModel();
-        $this->teacherClassModel = new TeacherClassModel();
-
-        $this->semesterScoreService = service('semesterScoreService');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-    }
-
-    public function add()
-    {
-        // 1) Get class_section_id from the view (POST/GET) with session fallback
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-
-        // (Optional) persist for downstream pages
-        session()->set('class_section_id', $classSectionId);
-
-        // (Optional) access check if you’re restricting by teacher/TA roles
-        // if (!$this->canAccessClassSection((int)(session()->get('user_id') ?? 0), $classSectionId)) {
-        //     return redirect()->back()->with('status', 'You do not have access to that class section.');
-        // }
-
-        $semester = $this->getSelectedSemesterFromRequest();
-        $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-        try {
-            $result = $this->getSavedScores($classSectionId, $semester, $schoolYear);
-            $missingOkMap = $this->missingScoreOverrideModel->getOverridesMap($classSectionId, $semester, $schoolYear, 'participation');
-
-            return view('teacher/add_participation', [
-                'students'       => $result['students'],
-                'semester'       => $result['semester'],
-                'schoolYear'     => $result['schoolYear'],
-                'classSectionId' => $classSectionId,
-                'missingOkMap'   => $missingOkMap,
-            ]);
-        } catch (\Throwable $e) {
-            return redirect()->back()->with('status', $e->getMessage());
-        }
-    }
-
-
-
-    public function update()
-    {
-        $updatedBy = session()->get('user_id');
-        $scores          = $this->request->getPost('final_score');
-        $classSectionId  = session()->get('class_section_id');
-
-        if (!is_array($scores)) {
-            return redirect()->back()->with('error', 'No scores submitted.');
-        }
-
-        $semester = $this->getSelectedSemesterFromRequest();
-        $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-        $this->saveParticipationScores('participation', $scores, $updatedBy, $classSectionId, $semester, $schoolYear);
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-        $studentIds = array_keys($scores);
-        $checkedItems = [];
-        if (is_array($missingOk)) {
-            foreach ($missingOk as $studentId => $flags) {
-                $checkedItems[] = [
-                    'student_id' => (int) $studentId,
-                    'item_index' => null,
-                ];
-            }
-        }
-        $this->missingScoreOverrideModel->replaceOverrides(
-            $classSectionId,
-            (string) $semester,
-            (string) $schoolYear,
-            'participation',
-            $studentIds,
-            null,
-            $checkedItems,
-            $updatedBy,
-            true
-        );
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-
-        return redirect()->to(base_url('/teacher/addParticipation'))
-            ->with('status', 'Participation scores updated successfully.');
-    }
-
-    public function updateMngt()
-    {
-        $scores          = $this->request->getPost('final_score');
-        $updatedBy       = $this->request->getPost('teacher_id') ?? session()->get('user_id'); // default to session user
-        $classSectionId  = session()->get('class_section_id');
-
-        if (!is_array($scores)) {
-            return redirect()->back()->with('error', 'No scores submitted.');
-        }
-
-        $semester = $this->getSelectedSemesterFromRequest();
-        $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-        $this->saveParticipationScores('participation', $scores, $updatedBy, $classSectionId, $semester, $schoolYear);
-
-        session()->setFlashdata('status', 'Participation scores updated successfully.');
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        // ⬇️ Directly call the method and return its view
-        return $this->showParticipationMngt();
-    }
-
-
-    public function showParticipationMngt()
-    {
-        // Get class_section_id from view (POST/GET) with session fallback
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-
-        // OPTIONAL: enforce access like we did for homework/midterm
-        // if (!$this->canAccessClassSection((int)(session()->get('user_id') ?? 0), $classSectionId)) {
-        //     return redirect()->back()->with('status', 'You do not have access to that class section.');
-        // }
-
-        try {
-            // Pull roster + saved (participation/midterm) scores for this section/term
-            // If you have a dedicated participation table, call its getter here instead.
-            $semester = $this->getSelectedSemesterFromRequest();
-            $schoolYear = $this->getSelectedSchoolYearFromRequest() ?? $this->schoolYear;
-            $result = $this->getSavedScores($classSectionId, $semester, $schoolYear);
-            $scoresLocked = $this->isScoresLocked($classSectionId, $semester, $schoolYear);
-
-            return view('grading/participation', [
-                'students'       => $result['students'],  // already includes school_id
-                'semester'       => $result['semester'],
-                'schoolYear'     => $result['schoolYear'],
-                'classSectionId' => $classSectionId,
-                'scoresLocked'   => $scoresLocked,
-            ]);
-        } catch (\Throwable $e) {
-            return redirect()->back()->with('status', $e->getMessage());
-        }
-    }
-
-    private function isScoresLocked(int $classSectionId, string $semester, string $schoolYear): bool
-    {
-        return $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-    }
-
-
-
-    private function saveParticipationScores(string $table, array $scores, int $updatedBy, int $classSectionId, string $semester, string $schoolYear): void
-    {
-        $db = \Config\Database::connect();
-        $builder = $db->table($table);
-        $now = utc_now();
-
-        foreach ($scores as $studentId => $data) {
-            if (!is_numeric($studentId) || !isset($data['score'])) {
-                continue;
-            }
-
-            $score = is_numeric($data['score']) ? (float) $data['score'] : null;
-
-            $existing = $builder
-                ->where('student_id', $studentId)
-                ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->get()
-                ->getRow();
-
-            $dataToSave = [
-                'student_id'       => $studentId,
-                'class_section_id' => $classSectionId,
-                'updated_by'       => $updatedBy,
-                'score'            => $score,
-                'semester'         => $semester,
-                'school_year'      => $schoolYear,
-                'updated_at'       => $now,
-            ];
-
-            if ($existing) {
-                $builder->where('id', $existing->id)->update($dataToSave);
-            } else {
-                $dataToSave['created_at'] = $now;
-                $builder->insert($dataToSave);
-            }
-        }
-    }
-
-    private function getSavedScores(int $classSectionId, string $semester, string $schoolYear): array
-    {
-        if ($classSectionId <= 0) {
-            throw new \InvalidArgumentException('Invalid class section id.');
-        }
-
-        session()->set('class_section_id', $classSectionId);
-
-        // Build a DISTINCT roster subquery correctly (no 'DISTINCT' inside select string)
-        $rosterSub = $this->db->table('student_class')
-            ->select('student_id')   // <-- just the column
-            ->distinct()             // <-- ask CI4 to add DISTINCT
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->getCompiledSelect();
-
-        // Main query: Students + LEFT JOIN participation for same section/term
-        $students = $this->db->table('students s')
-            ->select('
-            s.id AS student_id,
-            s.school_id,
-            s.firstname,
-            s.lastname,
-            p.score
-        ')
-            ->join("({$rosterSub}) sc", 'sc.student_id = s.id', 'inner', false)
-            ->join(
-                'participation p',
-                'p.student_id = s.id
-             AND p.class_section_id = ' . (int)$classSectionId . '
-             AND p.semester = ' . $this->db->escape($semester) . '
-             AND p.school_year = ' . $this->db->escape($schoolYear),
-                'left',
-                false
-            )
-            ->where('s.is_active', 1)
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()
-            ->getResultArray();
-
-        return [
-            'students'   => $students,
-            'semester'   => $semester,
-            'schoolYear' => $schoolYear,
-        ];
-    }
-
-    private function getTeacherSelectedSemester(): string
-    {
-        helper('semester_selection_helper');
-        return selected_teacher_semester();
-    }
-
-    private function getSelectedSemesterFromRequest(): string
-    {
-        $semesterParam = $this->request->getPost('semester')
-            ?? $this->request->getGet('semester')
-            ?? $this->request->getGet('filter');
-        $normalized = $this->normalizeSemesterSelection($semesterParam);
-        if ($normalized !== '') {
-            $label = ucfirst($normalized);
-            $session = session();
-            $session->set('teacher_scores_selected_semester', $label);
-            $session->set('semester', $label);
-        }
-
-        return $this->getTeacherSelectedSemester();
-    }
-
-    private function getSelectedSchoolYearFromRequest(): ?string
-    {
-        $yearParam = $this->request->getPost('school_year') ?? $this->request->getGet('school_year');
-        return $this->normalizeSchoolYear($yearParam);
-    }
-
-    private function normalizeSemesterSelection(?string $input): string
-    {
-        $value = strtolower(trim((string) $input));
-        if ($value === 'fall' || str_contains($value, '1')) {
-            return 'fall';
-        }
-        if ($value === 'spring' || str_contains($value, '2')) {
-            return 'spring';
-        }
-        return '';
-    }
-
-    private function normalizeSchoolYear(?string $input): ?string
-    {
-        $value = trim((string) $input);
-        if ($value === '') {
-            return null;
-        }
-        if (preg_match('/^\\d{4}\\s*[-\\/]\\s*\\d{4}$/', $value)) {
-            return preg_replace('/\\s+/', '', str_replace('/', '-', $value));
-        }
-        return null;
-    }
-}
diff --git a/app/Http/Controllers/old/PaymentController.php b/app/Http/Controllers/old/PaymentController.php
deleted file mode 100644
index 029c2d34..00000000
--- a/app/Http/Controllers/old/PaymentController.php
+++ /dev/null
@@ -1,1775 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\PaymentModel;
-use App\Models\AdditionalChargeModel;
-use App\Models\ClassSectionModel;
-use App\Models\ManualPaymentModel;
-use App\Models\EventChargesModel;
-use App\Models\UserModel;
-use App\Models\StudentModel;
-use App\Models\EnrollmentModel;
-use App\Models\ConfigurationModel;
-use App\Models\StudentClassModel;
-use App\Models\PaymentErrorModel;
-use App\Models\InvoiceModel;
-use App\Models\TeacherClassModel;
-use App\Models\DiscountUsageModel;
-use Config\PaypalConfig;
-use PayPal\Api\Amount;
-use PayPal\Api\Payment;
-use PayPal\Api\PaymentExecution;
-use PayPal\Api\Payer;
-use PayPal\Api\Transaction;
-use PayPal\Rest\ApiContext;
-use PayPal\Auth\OAuthTokenCredential;
-
-use CodeIgniter\RESTful\ResourceController;
-use CodeIgniter\Events\Events;
-
-class PaymentController extends ResourceController
-{
-    protected $paymentModel;
-    protected $paypalConfig;
-    protected $apiContext;
-    protected $request;
-    protected $db;
-    protected $invoiceModel;
-    protected $configModel;
-    protected $manualPaymentModel;
-    protected $eventChargesModel;
-    protected $userModel;
-    protected $schoolYear;
-    protected $semester;
-    protected $enrollmentModel;
-    protected $studentModel;
-    protected $studentClassModel;
-    protected $paymentErrorModel;
-    protected $installmentDate;
-    protected $teacherClassModel;
-    protected $discountUsageModel;
-    protected $additionalChargeModel;
-    protected $classSectionModel;
-
-    public function __construct()
-    {
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->paymentErrorModel = new PaymentErrorModel();
-        $this->userModel = new UserModel();
-        $this->eventChargesModel = new EventChargesModel();
-        $this->manualPaymentModel = new ManualPaymentModel();
-        $this->paymentModel = new PaymentModel();
-        $this->paypalConfig = new PaypalConfig();
-        $this->request = \Config\Services::request();
-        $this->db = \Config\Database::connect();
-        $this->invoiceModel = new InvoiceModel();
-        $this->configModel = new ConfigurationModel();
-        $this->enrollmentModel = new EnrollmentModel();
-        $this->studentModel = new StudentModel();
-        $this->studentClassModel = new StudentClassModel();
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester'); //installment_date
-        $this->installmentDate = $this->configModel->getConfig('installment_date');
-        $this->discountUsageModel = new DiscountUsageModel();
-        $this->additionalChargeModel = new AdditionalChargeModel();
-        $this->classSectionModel     = new ClassSectionModel();
-
-        // Set up PayPal API context
-        $this->apiContext = new ApiContext(
-            new OAuthTokenCredential(
-                $this->paypalConfig->paypalClientId,
-                $this->paypalConfig->paypalSecret
-            )
-        );
-
-        $this->apiContext->setConfig([
-            'mode' => $this->paypalConfig->paypalMode, // 'sandbox' or 'live'
-            'http.headers' => ['Connection' => 'Close']
-        ]);
-    }
-
-    // API: Create a new payment plan
-    public function createAPI()
-    {
-        $data = [
-            'parent_id' => $this->request->getPost('parent_id'),
-            'total_amount' => $this->request->getPost('total_amount'),
-            'number_of_installments' => $this->request->getPost('number_of_installments'),
-            'paid_amount' => 0,
-            'balance_amount' => $this->request->getPost('total_amount'),
-            'payment_date' => $this->request->getPost('payment_date'),
-            'payment_type' => $this->request->getPost('payment_type'),
-            'status' => 'Pending',
-            'semester' => $this->request->getPost('semester'),
-            'school_year' => $this->request->getPost('school_year'),
-        ];
-
-        if ($this->paymentModel->save($data)) {
-            return $this->respondCreated($data); // Send successful response
-        } else {
-            return $this->failValidationErrors($this->paymentModel->errors()); // Return validation errors
-        }
-    }
-
-    // API: Get payments by parent ID
-    public function getByParentAPI($parentId)
-    {
-        $payments = $this->paymentModel->getPaymentsByParentId($parentId);
-        if ($payments) {
-            return $this->respond($payments);
-        } else {
-            return $this->failNotFound('Payments not found for the parent.');
-        }
-    }
-
-    // View: Get payments by parent ID (for web views)
-    public function getByParent($parentId)
-    {
-        // Fetch payments with invoice number (if available)
-        $payments = $this->paymentModel
-            ->select('payments.*, invoices.invoice_number')
-            ->join('invoices', 'invoices.id = payments.invoice_id', 'left')
-            ->where('payments.parent_id', (int)$parentId)
-            ->orderBy('payments.payment_date', 'DESC')
-            ->findAll();
-
-        // Parent display name
-        $parent = $this->userModel->select('firstname, lastname')->find((int)$parentId) ?: [];
-        $parentName = trim(($parent['firstname'] ?? '') . ' ' . ($parent['lastname'] ?? ''));
-
-        // If requested for modal, return a fragment (no layout)
-        $isModal = (string)($this->request->getGet('modal') ?? '') === '1';
-        if ($isModal) {
-            return view('payment/_list_modal', [
-                'payments'   => $payments,
-                'parentId'   => (int)$parentId,
-                'parentName' => $parentName,
-            ], ['saveData' => true]);
-        }
-
-        // Full page fallback
-        return view('payment_list', [
-            'payments'   => $payments,
-            'parentId'   => (int)$parentId,
-            'parentName' => $parentName,
-        ]);
-    }
-
-    // View: Create a new payment plan
-    public function create()
-    {
-        return view('payment_create');
-    }
-
-    // API: Update balance after payment
-    public function updateBalanceAPI($paymentId)
-    {
-        $amountPaid = $this->request->getPost('paid_amount');
-        if ($this->paymentModel->updateBalance($paymentId, $amountPaid)) {
-            return $this->respond(['status' => 'success']);
-        } else {
-            return $this->failNotFound('Payment not found.');
-        }
-    }
-
-    // View: Update balance after payment
-    public function updateBalance($paymentId)
-    {
-        $amountPaid = $this->request->getPost('paid_amount');
-        if ($this->paymentModel->updateBalance($paymentId, $amountPaid)) {
-            return redirect()->to('/payments');
-        } else {
-            return redirect()->back()->with('error', 'Failed to update balance.');
-        }
-    }
-
-
-    // Create a PayPal payment
-    public function createPaypalPayment($paymentId)
-    {
-        // Fetch the payment details from the database
-        $payment = $this->paymentModel->find($paymentId);
-
-        // Create the payer object (who is making the payment)
-        $payer = new Payer();
-        $payer->setPaymentMethod('paypal');
-
-        // Set up the payment amount
-        $amount = new Amount();
-        $amount->setCurrency('USD')
-            ->setTotal($payment['balance_amount']);  // The balance amount to be paid
-
-        // Set up the transaction details
-        $transaction = new Transaction();
-        $transaction->setAmount($amount)
-            ->setDescription('Payment for school fees')
-            ->setInvoiceNumber(uniqid());
-
-        // Create the payment and set the redirect URLs
-        $payment = new Payment();
-        $payment->setIntent('sale')
-            ->setPayer($payer)
-            ->setTransactions([$transaction]);
-
-        // Set the approval URL for the payment
-        $redirectUrls = new \PayPal\Api\RedirectUrls();
-        $redirectUrls->setReturnUrl(base_url('payments/executePaypalPayment')) // Set this to where the user will be redirected after approval
-            ->setCancelUrl(base_url('payments/cancelPaypalPayment'));
-
-        $payment->setRedirectUrls($redirectUrls);
-
-        // Create the payment and get the approval URL
-        try {
-            $payment->create($this->apiContext);
-            // Store the payment ID in the session to retrieve it later
-            session()->set('paypalPaymentId', $payment->getId());
-            session()->set('paymentId', $paymentId);
-            $approvalUrl = $payment->getApprovalLink();
-
-            return redirect()->to($approvalUrl);  // Redirect the user to PayPal's approval page
-        } catch (\PayPal\Exception\PayPalConnectionException $ex) {
-            // Handle errors
-            echo $ex->getData();
-            exit;
-        }
-    }
-
-    // Execute the PayPal payment after user approval
-    public function executePaypalPayment()
-    {
-        // Get the payment ID and Payer ID from the request
-        $paymentId = session()->get('paypalPaymentId');
-        $payerId = $this->request->getGet('PayerID');
-
-        // Get the payment object using the payment ID
-        $payment = Payment::get($paymentId, $this->apiContext);
-
-        // Create an execution object to execute the payment
-        $execution = new PaymentExecution();
-        $execution->setPayerId($payerId);
-
-        // Execute the payment
-        try {
-            $result = $payment->execute($execution, $this->apiContext);
-
-            // Payment successful, update the payment status in the database
-            $paymentId = session()->get('paymentId');
-            $this->paymentModel->update($paymentId, ['status' => 'Completed']);
-
-            return redirect()->to('/payments');  // Redirect to the payments page after success
-        } catch (\PayPal\Exception\PayPalConnectionException $ex) {
-            // Handle payment execution failure
-            echo $ex->getData();
-            exit;
-        }
-    }
-
-    // Cancel the PayPal payment
-    public function cancelPaypalPayment()
-    {
-        // Payment was canceled by the user
-        return redirect()->to('/payments')->with('error', 'Payment was canceled.');
-    }
-
-
-    public function redirectPage()
-    {
-        $modeCheck = $this->configModel->getConfig('paypal_mode');
-
-        $parentId = session()->get('user_id'); // assuming this is the logged-in parent
-
-        // Get parent name and school ID
-        $parent = $this->db->table('users')
-            ->select('firstname, lastname, school_id')
-            ->where('id', $parentId)
-            ->get()
-            ->getRowArray();
-
-        $parentName = isset($parent['firstname'], $parent['lastname'])
-            ? $parent['firstname'] . ' ' . $parent['lastname']
-            : 'Parent';
-
-        $schoolId = $parent['school_id'] ?? null;
-
-        // Get latest invoice total_amount
-        $latestInvoice = $this->invoiceModel->where('parent_id', $parentId)
-            ->orderBy('created_at', 'DESC')
-            ->select('total_amount')
-            ->get()
-            ->getRowArray();
-
-        $totalAmount = $latestInvoice['total_amount'] ?? 0;
-
-        return view('payment/payment_redirect', [
-            'parentName'   => $parentName,
-            'totalAmount'  => $totalAmount,
-            'schoolId'     => $schoolId,
-            'modeCheck'    => $modeCheck,
-        ]);
-    }
-
-
-    public function paypal()
-    {
-        // Redirect to PayPal API or show instructions
-        return redirect()->to('https://www.paypal.com/ncp/payment/87FJL3EV8C7NE');
-    }
-
-    public function manual()
-    {
-        if (strtolower($this->request->getMethod()) === 'post') {
-            $data = [
-                'invoice_number'   => $this->request->getPost('invoice_number'),
-                'amount'           => $this->request->getPost('amount'),
-                'payment_method'   => $this->request->getPost('payment_method'),
-                'reference'        => $this->request->getPost('reference'),
-                'created_at'       => utc_now(),
-            ];
-
-            // Handle file upload if present
-            $proof = $this->request->getFile('proof');
-            if ($proof && $proof->isValid() && !$proof->hasMoved()) {
-                $filename = $proof->getRandomName();
-                $proof->move(WRITEPATH . 'uploads/payments/', $filename);
-                $data['proof_path'] = $filename;
-            }
-
-            $this->manualPaymentModel->insert($data);
-
-            return redirect()->back()->with('success', 'Payment info submitted successfully!');
-        }
-
-        return view('payment/manual_payment');
-    }
-
-    public function eventChargesShow()
-    {
-        $parents = $this->userModel->getParents();
-        $school_Year = $this->request->getGet('school_year') ?? $this->schoolYear;
-        $seme_ster = $this->request->getGet('semester') ?? $this->semester;
-
-        // Join with users and students for full info
-        $charges = $this->eventChargesModel
-            ->select('event_charges.*, users.firstname AS parent_firstname, users.lastname AS parent_lastname, students.firstname AS student_firstname, students.lastname AS student_lastname')
-            ->join('users', 'users.id = event_charges.parent_id', 'left')
-            ->join('students', 'students.id = event_charges.student_id', 'left')
-            ->where('event_charges.school_year', $school_Year)
-            ->where('event_charges.semester', $seme_ster)
-            ->orderBy('event_charges.created_at', 'DESC')
-            ->findAll();
-
-        return view('payment/event_charges', [
-            'charges' => $charges,
-            'parents' => $parents,
-            'school_year' => $school_Year,
-            'semester' => $seme_ster,
-        ]);
-    }
-
-    public function eventChargesUpdate()
-    {
-        $studentIds = $this->request->getPost('student_ids') ?? [];
-        $userId = session()->get('user_id');
-
-        $commonData = [
-            'parent_id'   => $this->request->getPost('parent_id'),
-            'event_name'  => $this->request->getPost('event_name'),
-            'description' => $this->request->getPost('description'),
-            'amount'      => $this->request->getPost('amount'),
-            'semester'    => $this->request->getPost('semester'),
-            'school_year' => $this->request->getPost('school_year'),
-            'charged'     => 0,
-            'updated_by'  => $userId,
-        ];
-
-        $success = false;
-
-        if (!empty($studentIds)) {
-            foreach ($studentIds as $studentId) {
-                $data = array_merge($commonData, ['student_id' => $studentId]);
-                $this->eventChargesModel->insert($data);
-                $success = true;
-            }
-        } elseif ($this->request->getPost('student_id')) {
-            $data = array_merge($commonData, ['student_id' => $this->request->getPost('student_id')]);
-            $this->eventChargesModel->insert($data);
-            $success = true;
-        }
-
-        if (!$success) {
-            return redirect()->back()->with('error', 'No student selected. Please select at least one.');
-        }
-
-        return redirect()->back()->with('success', 'Event charge(s) added successfully.');
-    }
-
-    public function getEnrolledStudents($parentId)
-    {
-        $enrollments = $this->enrollmentModel->getEnrolledStudents((int) $parentId, $this->schoolYear);
-
-        $students = [];
-        foreach ($enrollments as $row) {
-            $students[] = [
-                'id' => $row['id'],
-                'firstname' => $row['firstname'],
-                'lastname' => $row['lastname'],
-                'grade' => $this->studentClassModel->getStudentGrade($row['id']) ?? 'N/A',
-            ];
-        }
-
-        return $this->response->setJSON($students);
-    }
-
-    public function manualPaySearch()
-    {
-        helper('form');
-
-        $parentData = null;
-        $students   = [];
-        $payments   = [];
-        $invoices   = [];
-        $pager      = null;
-
-        // Read the search term (email or phone)
-        $searchTerm = trim((string) $this->request->getGet('search_term'));
-
-        // --- Installment end date comes ONLY from config ---
-        $installmentDateRaw = (string) ($this->installmentDate ?? '');
-        $installmentEndYmd  = '';
-        if ($installmentDateRaw) {
-            $ts = strtotime($installmentDateRaw);
-            if ($ts !== false) {
-                $installmentEndYmd = date('Y-m-d', $ts); // ensure 'YYYY-MM-DD'
-            }
-        }
-
-        if ($searchTerm !== '') {
-            $searchClean     = preg_replace('/\D/', '', $searchTerm);
-            $searchFormatted = $this->formatPhone($searchClean);
-
-            $builder = $this->db->table('users');
-            $builder->select('*');
-
-            // Build search conditions
-            $builder->groupStart();
-            $builder->where('email', $searchTerm);
-
-            if (!empty($searchClean)) {
-                if (strlen($searchClean) === 10) {
-                    $formattedPhone = substr($searchClean, 0, 3) . '-' . substr($searchClean, 3, 3) . '-' . substr($searchClean, 6, 4);
-                    $builder->orWhere('cellphone', $formattedPhone);
-                }
-
-                // compare stripped formatting
-                $builder->orWhere(
-                    "REPLACE(REPLACE(REPLACE(REPLACE(cellphone, '(', ''), ')', ''), '-', ''), ' ', '') =",
-                    $this->db->escapeString($searchClean),
-                    false
-                );
-            }
-
-            if (!empty($searchFormatted)) {
-                $builder->orWhere('cellphone', $searchFormatted);
-            }
-            $builder->groupEnd();
-
-            // Execute query
-            $parent = $builder->get()->getRowArray();
-
-            if (is_array($parent) && array_key_exists('password', $parent)) {
-                unset($parent['password']);
-            }
-
-            if ($parent && !empty($parent['id'])) {
-                $parentData = $parent;
-                $parentId   = (int) $parent['id'];
-
-                // Students
-                $students = $this->studentModel
-                    ->where('parent_id', $parentId)
-                    ->findAll();
-
-                // Payments (paginated)
-                $payments = $this->paymentModel
-                    ->where('parent_id', $parentId)
-                    ->orderBy('payment_date', 'DESC')
-                    ->paginate(10);
-                $pager = $this->paymentModel->pager;
-
-                // Invoices
-                $rawInvoices = $this->invoiceModel
-                    ->where('parent_id', $parentId) // <- fixed (removed "value:")
-                    ->orderBy('issue_date', 'DESC')
-                    ->findAll();
-
-                // Preload sums of actual payments/discounts/refunds per invoice to avoid stale invoice.paid_amount/balance
-                $paidByInvoice = [];
-                $discountByInvoice = [];
-                $refundByInvoice = [];
-                if (!empty($rawInvoices)) {
-                    $invoiceIds = array_values(array_unique(array_map(static fn($r) => (int)($r['id'] ?? 0), $rawInvoices)));
-                    if (!empty($invoiceIds)) {
-                        $rows = $this->paymentModel
-                            ->select('invoice_id, COALESCE(SUM(paid_amount),0) AS total_paid')
-                            ->whereIn('invoice_id', $invoiceIds)
-                            ->groupBy('invoice_id')
-                            ->get()->getResultArray();
-                        foreach ($rows as $r) {
-                            $iid = (int)($r['invoice_id'] ?? 0);
-                            $paidByInvoice[$iid] = (float)($r['total_paid'] ?? 0);
-                        }
-
-                        // Sum discounts per invoice_id
-                        $discRows = $this->db->table('discount_usages')
-                            ->select('invoice_id, COALESCE(SUM(discount_amount),0) AS total_disc')
-                            ->whereIn('invoice_id', $invoiceIds)
-                            ->groupBy('invoice_id')
-                            ->get()->getResultArray();
-                        foreach ($discRows as $dr) {
-                            $iid = (int)($dr['invoice_id'] ?? 0);
-                            $discountByInvoice[$iid] = (float)($dr['total_disc'] ?? 0);
-                        }
-
-                        // Sum PAID refunds per invoice_id (only Partial/Paid reduce liability)
-                        $refRows = $this->db->table('refunds')
-                            ->select('invoice_id, COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
-                            ->whereIn('invoice_id', $invoiceIds)
-                            ->whereIn('status', ['Partial','Paid'])
-                            ->groupBy('invoice_id')
-                            ->get()->getResultArray();
-                        foreach ($refRows as $rr) {
-                            $iid = (int)($rr['invoice_id'] ?? 0);
-                            $refundByInvoice[$iid] = (float)($rr['total_refund_paid'] ?? 0);
-                        }
-                    }
-                }
-
-                // Normalize invoices for the view/JS; force due_ymd to the CONFIG date
-                $invoices = array_map(function (array $inv) use ($installmentEndYmd, $paidByInvoice, $discountByInvoice, $refundByInvoice) {
-                    // Cast numeric fields we rely on
-                    $inv['total_amount'] = isset($inv['total_amount']) ? (float) $inv['total_amount'] : 0.0;
-                    // Prefer actual sum of payments for paid_amount
-                    $iid = (int)($inv['id'] ?? 0);
-                    $actualPaid = isset($paidByInvoice[$iid]) ? (float)$paidByInvoice[$iid] : null;
-                    $inv['paid_amount']  = is_numeric($actualPaid)
-                        ? (float)$actualPaid
-                        : (isset($inv['paid_amount']) ? (float)$inv['paid_amount'] : 0.0);
-                    // Per-invoice discount
-                    $inv['discount'] = isset($discountByInvoice[$iid]) ? (float)$discountByInvoice[$iid] : (float)($inv['discount'] ?? 0.0);
-
-                    // Per-invoice refunds (paid out)
-                    $inv['refund_paid'] = isset($refundByInvoice[$iid]) ? (float)$refundByInvoice[$iid] : 0.0;
-
-                    // Derive balance from total - paid - discount - refundsPaid (never below 0)
-                    $inv['balance'] = max(0.0, (float)$inv['total_amount'] - (float)$inv['paid_amount'] - (float)$inv['discount'] - (float)$inv['refund_paid']);
-
-                    // Always use the configured end date for installments
-                    $inv['due_ymd'] = $installmentEndYmd;
-
-                    // Optional: keep a start marker if you ever need it elsewhere
-                    $issueYmd = '';
-                    foreach (['issue_date', 'start_date', 'created_at'] as $k) {
-                        if (!empty($inv[$k])) {
-                            $its = strtotime($inv[$k]);
-                            if ($its !== false) {
-                                $issueYmd = date('Y-m-d', $its);
-                                break;
-                            }
-                        }
-                    }
-                    $inv['issue_ymd'] = $issueYmd;
-
-                    return $inv;
-                }, $rawInvoices);
-            }
-        }
-
-        return view('payment/manual_pay', [
-            'parent'                 => $parentData,
-            'students'               => $students,
-            'payments'               => $payments,
-            'invoices'               => $invoices,
-            'pager'                  => $pager,
-            'searchTermUsedInSearch' => $searchTerm,
-            'todayYmd'               => utc_now(),
-            'installmentEndYmd'      => $installmentEndYmd, // SELECT will use this in data-end-date
-        ]);
-    }
-
-    public function manualPaySuggest()
-    {
-        $q = trim((string)($this->request->getGet('q') ?? ''));
-        if ($q === '') {
-            return $this->response->setJSON(['items' => []]);
-        }
-
-        $db = $this->db;
-        $qs = '%' . $db->escapeLikeString($q) . '%';
-        $digits = preg_replace('/\D/', '', $q);
-
-        $sql = "SELECT id, firstname, lastname, email, cellphone
-                  FROM users
-                 WHERE (
-                        CONCAT_WS(' ', firstname, lastname) LIKE ?
-                     OR email LIKE ?
-                     OR cellphone LIKE ?";
-        $params = [$qs, $qs, $qs];
-
-        if ($digits !== '') {
-            $sql .= " OR REPLACE(REPLACE(REPLACE(REPLACE(cellphone, '(', ''), ')', ''), '-', ''), ' ', '') LIKE ?";
-            $params[] = '%' . $digits . '%';
-        }
-
-        $sql .= ")
-                 ORDER BY lastname, firstname
-                 LIMIT 20";
-
-        $rows = $db->query($sql, $params)->getResultArray();
-        $items = [];
-        foreach ($rows as $row) {
-            $label = trim(($row['firstname'] ?? '') . ' ' . ($row['lastname'] ?? ''));
-            $email = trim((string)($row['email'] ?? ''));
-            $phone = trim((string)($row['cellphone'] ?? ''));
-            $sub = trim($email . ' ' . $phone);
-            $value = $email !== '' ? $email : ($phone !== '' ? $phone : $label);
-
-            $items[] = [
-                'id'    => (int)($row['id'] ?? 0),
-                'label' => $label,
-                'sub'   => $sub,
-                'value' => $value,
-            ];
-        }
-
-        return $this->response->setJSON(['items' => $items]);
-    }
-
-    private function updateEnrollmentStatusIfPaid(int $invoiceId): int
-{
-    // 1) Fetch invoice
-    $invoice = $this->invoiceModel->find($invoiceId);
-    if (!$invoice) {
-        log_message('warning', 'Invoice not found: {id}', ['id' => $invoiceId]);
-        return 0;
-    }
-
-    // 2) Payment check: recompute current balance from payments (authoritative)
-    $total         = (float) ($invoice['total_amount'] ?? 0);
-    $currentBal    = $this->getCurrentInvoiceBalance($invoiceId); // <-- uses the safe helper
-    if (!($total > 0 && $currentBal < $total)) {
-        log_message('info', 'No payment yet (or still full balance). Skipping enrollment update. Invoice #{id}', ['id' => $invoiceId]);
-        return 0;
-    }
-
-    $parentId   = (int) ($invoice['parent_id'] ?? 0);
-    $schoolYear = (string) $this->schoolYear;
-    $semester   = isset($this->semester) && $this->semester !== '' ? (string)$this->semester : null;
-
-    if ($parentId <= 0 || $schoolYear === '') {
-        log_message('warning', 'updateEnrollmentStatusIfPaid: missing parent_id/school_year for invoice #{id}', ['id' => $invoiceId]);
-        return 0;
-    }
-
-    // 3) Try to limit to enrollments actually present on the invoice (optional)
-    $paidEnrollmentIds = [];
-    try {
-        $hasInvoiceItems = false;
-        try {
-            $hasInvoiceItems = (bool) $this->db->query("SHOW TABLES LIKE 'invoice_items'")->getNumRows();
-        } catch (\Throwable $e) {
-            $hasInvoiceItems = false;
-        }
-
-        if ($hasInvoiceItems) {
-            $rows = $this->db->table('invoice_items')
-                ->select('enrollment_id')
-                ->where('invoice_id', $invoiceId)
-                ->where('enrollment_id IS NOT NULL', null, false)
-                ->get()->getResultArray();
-
-            foreach ($rows as $r) {
-                $eid = (int)($r['enrollment_id'] ?? 0);
-                if ($eid > 0) $paidEnrollmentIds[] = $eid;
-            }
-            $paidEnrollmentIds = array_values(array_unique($paidEnrollmentIds));
-        }
-    } catch (\Throwable $e) {
-        // proceed without narrowing
-        $paidEnrollmentIds = [];
-    }
-
-    // 4) Preview IDs that will be updated (good for debugging “partials”)
-    $previewBuilder = $this->db->table('enrollments')
-        ->select('id')
-        ->where('parent_id', $parentId)
-        ->where('school_year', $schoolYear)
-        ->groupStart()
-            // tolerant match for 'payment pending' (case/space/nbsp)
-            ->where('enrollment_status', 'payment pending')
-            ->orWhere('enrollment_status', 'Payment pending')
-            ->orWhere('enrollment_status', 'Payment Pending')
-            ->orWhere('enrollment_status', 'PAYMENT PENDING')
-            ->orWhere("LOWER(TRIM(REPLACE(enrollment_status, CHAR(160), ' '))) = 'payment pending'", null, false)
-        ->groupEnd();
-
-    if ($semester !== null) {
-        $previewBuilder->where('semester', $semester);
-    }
-    if (!empty($paidEnrollmentIds)) {
-        $previewBuilder->whereIn('id', $paidEnrollmentIds);
-    }
-
-    $toUpdateIds = array_map(
-        static fn($r) => (int)$r['id'],
-        $previewBuilder->get()->getResultArray()
-    );
-
-    if (empty($toUpdateIds)) {
-        log_message('info', 'No enrollments matched pending status for parent {p}, year {y}, sem {s}.', [
-            'p' => $parentId,
-            'y' => $schoolYear,
-            's' => $semester ?? 'ALL'
-        ]);
-        return 0;
-    }
-
-    // 5) Perform update only if we have rows to change
-    $db = $this->db;
-    $db->transBegin();
-    try {
-        $builder = $db->table('enrollments');
-        $builder->set('enrollment_status', 'enrolled')
-                ->set('enrollment_date', local_date(utc_now(), 'Y-m-d')) // or 'CURRENT_DATE()' with false flag
-                ->whereIn('id', $toUpdateIds);
-
-        if ($builder->update() === false) {
-            $err = $db->error();
-            throw new \RuntimeException('Enrollments update failed: ' . ($err['message'] ?? 'unknown DB error'));
-        }
-
-        $affected = $db->affectedRows();
-        $db->transCommit();
-
-        log_message(
-            'info',
-            'Enrollment status -> enrolled for {n} row(s). parent={p}, year={y}, sem={s}, ids=[{ids}]',
-            [
-                'n'   => $affected,
-                'p'   => $parentId,
-                'y'   => $schoolYear,
-                's'   => $semester ?? 'ALL',
-                'ids' => implode(',', $toUpdateIds),
-            ]
-        );
-
-        return $affected;
-    } catch (\Throwable $e) {
-        $db->transRollback();
-        log_message('error', 'updateEnrollmentStatusIfPaid error: ' . $e->getMessage());
-        return 0;
-    }
-}
-
-
-
-    private function buildStudentEnrolledEventData(
-        int $parentId,
-        array $studentIds,
-        ?string $schoolYear = null,
-        ?string $semester   = null,
-        ?string $portalLink = null
-    ): array {
-        $schoolYear = $schoolYear ?? $this->schoolYear;
-        $semester   = $semester   ?? $this->semester;
-        $portalLink = $portalLink ?? site_url('/login');
-
-        // --- Parent/User info ---
-        $parent = $this->db->table('users')
-            ->select('id, firstname, lastname, email')
-            ->where('id', $parentId)
-            ->get()->getRowArray();
-
-        if (!$parent) {
-            throw new \RuntimeException("Parent user #{$parentId} not found");
-        }
-
-        // Normalize student ids and guard against empty arrays
-        $ids = array_values(array_unique(array_map('intval', $studentIds)));
-        if (empty($ids)) {
-            // If none provided, fetch all of this parent's students for the current term (optional behavior)
-            $ids = array_map(
-                fn($r) => (int)$r['id'],
-                $this->db->table('students')
-                    ->select('id')
-                    ->where('parent_id', $parentId)
-                    ->get()->getResultArray()
-            );
-        }
-
-        // If still empty, return minimal payload
-        if (empty($ids)) {
-            $data = [
-                'user_id'     => (int) $parent['id'],
-                'email'       => $parent['email'] ?? null,
-                'firstname'   => $parent['firstname'] ?? '',
-                'lastname'    => $parent['lastname'] ?? '',
-                'school_year' => $schoolYear,
-            ];
-            return [$data, []];
-        }
-
-        // --- One-shot enrichment query ---
-        // NOTE on classSection PK:
-        // If your classSection PK is `class_section_id` (common in your code), keep the join below.
-        // If it’s `id`, change the ON to `cs.id = sc.class_section_id`.
-        $qb = $this->db->table('students s');
-        $qb->select("
-        s.id AS student_id,
-        s.firstname AS s_firstname,
-        s.lastname  AS s_lastname,
-        s.registration_grade,
-        sc.class_section_id,
-        cs.class_section_name,
-        tu.firstname AS t_firstname,
-        tu.lastname  AS t_lastname
-    ");
-
-        // current term assignment (left join so unassigned students still appear)
-        $qb->join(
-            'student_class sc',
-            'sc.student_id = s.id AND sc.school_year = ' . $this->db->escape($schoolYear),
-            'left'
-        );
-
-        // section name
-        $qb->join(
-            'classSection cs',
-            'cs.class_section_id = sc.class_section_id',
-            'left'
-        );
-
-        // main teacher for that section in the same term
-        $qb->join(
-            'teacher_class tc',
-            'tc.class_section_id = sc.class_section_id
-         AND tc.position = "main"
-         AND tc.school_year = ' . $this->db->escape($schoolYear),
-            'left'
-        );
-
-        // teacher user for name
-        $qb->join('users tu', 'tu.id = tc.teacher_id', 'left');
-
-        $qb->where('s.parent_id', $parentId)
-            ->whereIn('s.id', $ids);
-
-        // If a student can have multiple sc rows for the same term, you may need a strategy to pick one.
-        // The simplest is to prefer the most recently updated:
-        $qb->orderBy('sc.updated_at', 'DESC');
-
-        $rows = $qb->get()->getResultArray();
-
-        // Fallback minimal data if nothing came back (should be rare)
-        if (!$rows) {
-            $rows = $this->db->table('students s')
-                ->select('s.id AS student_id, s.firstname AS s_firstname, s.lastname AS s_lastname, s.registration_grade')
-                ->whereIn('s.id', $ids)
-                ->where('s.parent_id', $parentId)
-                ->get()->getResultArray();
-        }
-
-        // Build normalized student array
-        $studentdata = [];
-        $seen = []; // to avoid duplicates if joins produce multiple rows per student
-        foreach ($rows as $r) {
-            $sid = (int) ($r['student_id'] ?? 0);
-            if ($sid <= 0 || isset($seen[$sid])) continue;
-            $seen[$sid] = true;
-
-            $teacherFull = trim(
-                trim((string)($r['t_firstname'] ?? '')) . ' ' .
-                    trim((string)($r['t_lastname'] ?? ''))
-            );
-            if ($teacherFull === '') {
-                $teacherFull = null; // keep null if no teacher yet
-            }
-
-            $studentdata[] = [
-                'id'               => $sid,
-                'student_id'       => $sid,
-                'firstname'        => (string)($r['s_firstname'] ?? ''),
-                'lastname'         => (string)($r['s_lastname'] ?? ''),
-                'name'             => trim(((string)($r['s_firstname'] ?? '')) . ' ' . ((string)($r['s_lastname'] ?? ''))),
-                'registration_grade' => (string)($r['registration_grade'] ?? ''), // what they registered for
-                'class_section_id' => isset($r['class_section_id']) ? (int)$r['class_section_id'] : null,
-                'class_section_name' => $r['class_section_name'] ?? null,        // actual placed section (if any)
-                'teacher_name'     => $teacherFull,                               // main teacher for placed section/term
-                'start_date'       => '',                                         // fill if you have it elsewhere
-                'portal_link'      => $portalLink,
-            ];
-        }
-
-        // Top-level envelope consumed by handleStudentEnrolled()
-        $data = [
-            'user_id'     => (int) $parent['id'],
-            'email'       => $parent['email'] ?? null,
-            'firstname'   => $parent['firstname'] ?? '',
-            'lastname'    => $parent['lastname'] ?? '',
-            'school_year' => $schoolYear,
-            'semester'    => $semester,
-            'portal_link' => $portalLink,
-        ];
-
-        return [$data, $studentdata];
-    }
-
-    private function buildPaymentEventData(
-        int $invoiceId,
-        string $transactionId,
-        float $amount,
-        string $paymentMethod,
-        string $paymentDate,
-        ?string $checkNumber,
-        int $installmentSeq,
-        float $preBalance,
-        float $postBalance,
-        ?float $invoiceDiscount = null,
-        ?float $parentYearDiscountTotal = null
-    ): array {
-        $invoice  = $this->invoiceModel->find($invoiceId) ?: [];
-        $parentId = (int) ($invoice['parent_id'] ?? 0);
-
-        $parent = $parentId
-            ? ($this->db->table('users')->select('id, firstname, lastname, email')->where('id', $parentId)->get()->getRowArray() ?: [])
-            : [];
-
-        $eventData = [
-            'invoice_id'        => $invoiceId,
-            'invoice_number'    => $invoice['invoice_number'] ?? null,
-
-            // both keys, to satisfy any template
-            'transaction_id'    => $transactionId,
-            'transactionId'     => $transactionId,
-
-            // payment
-            'amount'            => (float) $amount,
-            'payment_method'    => $paymentMethod,
-            'method'            => $paymentMethod,
-            'payment_date'      => $paymentDate,
-            'check_number'      => $checkNumber ?: null,
-            'installment_seq'   => (int) $installmentSeq,
-
-            // balances
-            'pre_balance'       => (float) $preBalance,
-            'post_balance'      => (float) $postBalance,
-
-            // totals
-            'invoice_total'     => (float) ($invoice['total_amount'] ?? 0),
-
-            // parent
-            'user_id'           => (int) ($parent['id'] ?? $parentId),
-            'email'             => $parent['email'] ?? null,
-            'firstname'         => $parent['firstname'] ?? null,
-            'lastname'          => $parent['lastname'] ?? null,
-
-            'school_year'       => $this->schoolYear,
-            'semester'          => $this->semester,
-        ];
-
-        if ($invoiceDiscount !== null) {
-            $eventData['invoice_discount'] = (float) $invoiceDiscount;
-        }
-        if ($parentYearDiscountTotal !== null) {
-            $eventData['parent_year_discount_total'] = (float) $parentYearDiscountTotal;
-        }
-
-        // lightweight student list
-        $students = [];
-        if ($parentId) {
-            $studentRows = $this->db->table('students')
-                ->select('id, firstname, lastname')
-                ->where('parent_id', $parentId)
-                ->orderBy('lastname', 'ASC')
-                ->get()->getResultArray();
-            foreach ($studentRows as $r) {
-                $students[] = [
-                    'id'        => (int) $r['id'],
-                    'firstname' => (string) ($r['firstname'] ?? ''),
-                    'lastname'  => (string) ($r['lastname'] ?? ''),
-                    'name'      => trim(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? '')),
-                ];
-            }
-        }
-
-        return [$eventData, $students];
-    }
-
-    public function manualPayUpdate()
-    {
-        $invoiceId      = (int) $this->request->getPost('invoice_id');
-        $amount         = (float) $this->request->getPost('amount');
-        $paymentMethod  = strtolower(trim((string) $this->request->getPost('payment_method'))); // cash|check|card
-        $checkNumber    = trim((string) $this->request->getPost('check_number'));
-        $searchTerm     = $this->request->getPost('search_term') ?? $this->request->getGet('search_term') ?? '';
-
-        // UI-only
-        $paymentType    = strtolower((string) ($this->request->getPost('payment_type') ?? 'full')); // full|installment
-
-        // Accept user-entered date or now()
-        $paymentDateStr = $this->request->getPost('payment_date');
-        $paymentDate    = $paymentDateStr ? date('Y-m-d H:i:s', strtotime($paymentDateStr)) : utc_now();
-
-        // Basic validation
-        if (!$invoiceId || !$amount || !$paymentMethod) {
-            return redirect()->back()->withInput()->with('error', 'Missing required fields (invoice, amount, or method).');
-        }
-
-        $allowedMethods = ['cash', 'check', 'card'];
-        if (!in_array($paymentMethod, $allowedMethods, true)) {
-            return redirect()->back()->withInput()->with('error', 'Invalid payment method.');
-        }
-
-        if ($paymentMethod === 'check' && $checkNumber === '') {
-            return redirect()->back()->withInput()->with('error', 'Check number is required for check payments.');
-        }
-
-        if ($amount <= 0) {
-            return redirect()->back()->withInput()->with('error', 'Invalid amount: ' . number_format($amount, 2));
-        }
-
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) {
-            return redirect()->back()->with('error', 'Invoice not found.');
-        }
-
-        // Snapshot pre-payment balance
-        $initialPreBalance = $this->getCurrentInvoiceBalance($invoiceId);
-
-        // Card must equal full balance
-        if ($paymentMethod === 'card' && (float)round($amount, 2) !== (float)round($initialPreBalance, 2)) {
-            return redirect()->back()->withInput()->with(
-                'error',
-                'Debit/Credit Card payments must equal the full remaining balance (' . number_format($initialPreBalance, 2) . ').'
-            );
-        }
-
-        // Optional receipt upload
-        $checkFile   = null;
-        $paymentFile = $this->request->getFile('payment_file');
-        if ($paymentFile && $paymentFile->isValid() && !$paymentFile->hasMoved()) {
-            $okTypes = ['image/jpeg', 'image/png', 'application/pdf'];
-            $okExts  = ['jpg', 'jpeg', 'png', 'pdf'];
-
-            $mime = $paymentFile->getMimeType();
-            $ext  = strtolower($paymentFile->getClientExtension());
-
-            if (!in_array($mime, $okTypes, true) || !in_array($ext, $okExts, true)) {
-                return redirect()->back()->withInput()->with('error', 'Unsupported file type. Use JPG, PNG, or PDF.');
-            }
-            if ($paymentFile->getSize() > 5 * 1024 * 1024) {
-                return redirect()->back()->withInput()->with('error', 'File too large. Max 5MB.');
-            }
-
-            $fileName  = $paymentFile->getRandomName();
-            $subdir    = ($paymentMethod === 'check') ? 'checks' : (($paymentMethod === 'card') ? 'cards' : 'misc');
-            $targetDir = WRITEPATH . 'uploads/' . $subdir . '/';
-            if (!is_dir($targetDir)) @mkdir($targetDir, 0775, true);
-            $paymentFile->move($targetDir, $fileName);
-            $checkFile = $fileName;
-        }
-        $this->db->transBegin();
-
-        try {
-            // Lock invoice & get context (also ensure totals are up-to-date before validation)
-            $row = $this->db->query(
-                'SELECT id, parent_id, total_amount, school_year FROM invoices WHERE id = ? FOR UPDATE',
-                [$invoiceId]
-            )->getRowArray();
-
-            if (!$row) {
-                $this->db->transRollback();
-                return redirect()->back()->with('error', 'Invoice not found.');
-            }
-
-            $parentId = (int)($row['parent_id'] ?? 0);
-            $invYear  = (string)($row['school_year'] ?? $this->schoolYear);
-
-            // Recompute invoice totals from tuition + events + additional charges
-            $this->recalculateInvoice($invoiceId, $invYear);
-
-            // Authoritative balance
-            $currentBalance = $this->getCurrentInvoiceBalance($invoiceId);
-
-            if ($amount > $currentBalance + 0.00001) {
-                $this->db->transRollback();
-                return redirect()->back()->withInput()->with(
-                    'error',
-                    'Entered amount (' . number_format($amount, 2) . ') exceeds remaining balance (' . number_format($currentBalance, 2) . ').'
-                );
-            }
-
-            if ($paymentMethod === 'card' && (float)round($amount, 2) !== (float)round($currentBalance, 2)) {
-                $this->db->transRollback();
-                return redirect()->back()->withInput()->with(
-                    'error',
-                    'Debit/Credit Card payments must equal the full remaining balance (' . number_format($currentBalance, 2) . ').'
-                );
-            }
-
-            // Installment sequence
-            $paidCount      = $this->getSuccessfulPaymentCount($invoiceId);
-            $installmentSeq = $paidCount + 1;
-
-            // Generate a stable transaction id
-            $transactionId = 'INV-' . $invoiceId . '-' . str_replace('.', '', (string)microtime(true));
-
-            // Record payment
-            $ok = $this->processPayment(
-                $invoiceId,
-                $amount,
-                $paymentMethod,
-                $checkFile,
-                $transactionId,
-                $paymentDate,
-                $this->schoolYear,
-                $this->semester,
-                $checkNumber,
-                $installmentSeq
-            );
-
-            if (!$ok) {
-                $this->db->transRollback();
-                return redirect()->back()->with('error', 'Failed to record payment.');
-            }
-
-            // Ensure invoice totals/balance reflect discounts and this payment
-            $this->recalculateInvoice($invoiceId, $this->schoolYear);
-
-            // Post-payment balance from snapshot
-            $postBalance = (float)round($initialPreBalance - $amount, 2);
-            if ($postBalance < 0) $postBalance = 0.0;
-
-            // Optional enrollment update
-            $enrollmentupdated = $this->updateEnrollmentStatusIfPaid($invoiceId);
-            if ($enrollmentupdated != 0) {
-                $studentIds = $this->studentModel->getStudentIdsByParentId($parentId);
-                [$eventDataEnroll, $studentDataEnroll] = $this->buildStudentEnrolledEventData($parentId, $studentIds);
-                Events::trigger('studentEnrolled', $eventDataEnroll, $studentDataEnroll);
-            }
-
-            // --- Discounts (keep payment and discount separate!)
-            // Per-invoice discount: sum by invoice_id ONLY (no year filter so we never miss it)
-            $invoiceDiscount = 0.0;
-            $rowDisc = $this->db->table('discount_usages')
-                ->selectSum('discount_amount', 'sum_disc')
-                ->where('invoice_id', $invoiceId)
-                ->get()->getRowArray();
-            if ($rowDisc && isset($rowDisc['sum_disc'])) {
-                $invoiceDiscount = (float)$rowDisc['sum_disc'];
-            }
-
-            // Parent YTD (same school year)
-            $parentYearDiscountTotal = 0.0;
-            $rowParentDisc = $this->db->table('discount_usages')
-                ->selectSum('discount_amount', 'sum_disc')
-                ->where('parent_id', $parentId)
-                ->where('school_year', $this->schoolYear)
-                ->get()->getRowArray();
-            if ($rowParentDisc && isset($rowParentDisc['sum_disc'])) {
-                $parentYearDiscountTotal = (float)$rowParentDisc['sum_disc'];
-            }
-
-            $this->db->transCommit();
-
-            // Build payload & notify
-            [$eventData, $studentData] = $this->buildPaymentEventData(
-                $invoiceId,
-                $transactionId,
-                $amount,
-                $paymentMethod,
-                $paymentDate,
-                $checkNumber,
-                $installmentSeq,
-                $initialPreBalance,
-                $postBalance,
-                $invoiceDiscount,
-                $parentYearDiscountTotal
-            );
-
-            Events::trigger('paymentReceived', $eventData, $studentData);
-
-            return redirect()
-                ->to(site_url('payment/manual_pay?search_term=' . urlencode($searchTerm)))
-                ->with('success', 'Payment recorded successfully (Installment #' . $installmentSeq . '). Transaction ID: ' . $transactionId);
-        } catch (\Throwable $e) {
-            if ($this->db->transStatus()) $this->db->transRollback();
-            log_message('error', '[manualPayUpdate] ' . $e->getMessage());
-            return redirect()->back()->withInput()->with('error', 'Unexpected error while recording payment.');
-        }
-    }
-
-
-    public function manualPayEdit()
-    {
-        $paymentId     = (int) $this->request->getPost('payment_id');
-        $paidAmount    = (float) $this->request->getPost('paid_amount');
-        $paymentMethod = $this->request->getPost('payment_method');
-        $checkNumber   = $this->request->getPost('check_number'); // ✅ Added check_number
-
-        if (!$paymentId || !$paidAmount || !$paymentMethod) {
-            return redirect()->back()->with('error', 'Missing required fields.');
-        }
-
-        $payment = $this->paymentModel->find($paymentId);
-        if (!$payment) {
-            return redirect()->back()->with('error', 'Original payment not found.');
-        }
-
-        $invoice = $this->invoiceModel->find($payment['invoice_id']);
-        if (!$invoice) {
-            return redirect()->back()->with('error', 'Linked invoice not found.');
-        }
-
-        //$schoolYear = (new ConfigurationModel())->getConfig('school_year');
-        $checkFile  = $payment['check_file']; // default keep old file
-
-        // Handle optional check or card payment receipt upload
-        if (strtolower($paymentMethod) === 'check') {
-            $paymentFile = $this->request->getFile('payment_file'); // ✅ Updated to payment_file
-            if ($paymentFile && $paymentFile->isValid() && !$paymentFile->hasMoved()) {
-                $fileName = $paymentFile->getRandomName();
-                $paymentFile->move(WRITEPATH . 'uploads/checks/', $fileName);
-                $checkFile = $fileName;
-            }
-        } elseif (strtolower($paymentMethod) === 'card') {
-            $paymentFile = $this->request->getFile('payment_file'); // ✅ Updated to payment_file
-            if ($paymentFile && $paymentFile->isValid() && !$paymentFile->hasMoved()) {
-                $fileName = $paymentFile->getRandomName();
-                $paymentFile->move(WRITEPATH . 'uploads/cards/', $fileName);
-                $checkFile = $fileName; // reuse for compatibility
-            }
-        }
-
-        // ❌ Validate amount - negative or zero
-        if ($paidAmount <= 0) {
-            return redirect()->back()->with(
-                'error',
-                'Invalid amount entered: ' . number_format($paidAmount, 2) . '. Amount must be greater than zero.'
-            );
-        }
-
-        // 🔄 Recalculate invoice first to ensure totals reflect tuition + events + additional
-        $this->recalculateInvoice($payment['invoice_id'], $this->schoolYear);
-
-        // 🔄 Get current balance based on actual payments (with school_year filter)
-        // We need to calculate what the balance would be WITHOUT the current payment being edited
-        $currentBalance = $this->getCurrentInvoiceBalanceExcludingPayment($payment['invoice_id'], $paymentId);
-
-        if ($paidAmount > $currentBalance) {
-            return redirect()->back()->with(
-                'error',
-                'Entered amount (' . number_format($paidAmount, 2) . ') exceeds remaining balance (' . number_format($currentBalance, 2) . ').'
-            );
-        }
-
-        // ✅ Update edited payment with check_number
-        $updateData = [
-            'paid_amount'   => $paidAmount,
-            'payment_method' => strtolower($paymentMethod),
-            'check_file'    => $checkFile,
-            'updated_by'    => session()->get('user_id')
-        ];
-
-        // ✅ Only add check_number if payment method is check
-        if (strtolower($paymentMethod) === 'check') {
-            $updateData['check_number'] = $checkNumber;
-        } else {
-            $updateData['check_number'] = null; // Clear check number for non-check payments
-        }
-
-        $this->paymentModel->update($paymentId, $updateData);
-
-        // 🔄 Always recalc invoice after change
-        $this->recalculateInvoice($payment['invoice_id'], $this->schoolYear);
-
-        return redirect()->back()->with('success', 'Payment updated successfully.');
-    }
-
-
-    /**
-     * 🔄 Helper: Recalculate invoice totals and status based on all payments for current school year
-     */
-    private function recalculateInvoice($invoiceId, $schoolYear)
-    {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) return;
-
-        $parentId = (int)($invoice['parent_id'] ?? 0);
-        if ($parentId <= 0) return;
-
-        // ---- Tuition (recompute from enrollments) ----
-        $enrollments = $this->enrollmentModel
-            ->where('parent_id', $parentId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $registered = [];
-        $withdrawn  = [];
-        foreach ($enrollments as $e) {
-            $row = [
-                'student_id'       => (int)($e['student_id'] ?? 0),
-                'class_section_id' => $e['class_section_id'] ?? null,
-                'enrollment_status'=> (string)($e['enrollment_status'] ?? ''),
-            ];
-            if (in_array($row['enrollment_status'], ['enrolled','payment pending'], true)) {
-                $registered[] = $row;
-            } elseif (in_array($row['enrollment_status'], ['withdrawn','refund pending','withdraw under review'], true)) {
-                $withdrawn[] = $row;
-            }
-        }
-
-        // Refund window check – if after deadline, withdrawn still billed
-        $refundDeadline = (string)($this->configModel->getConfig('refund_deadline') ?? '');
-        $refundAllowed  = true;
-        try {
-            $tzName   = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-            $tz       = new \DateTimeZone($tzName);
-            $today    = new \DateTimeImmutable('today', $tz);
-            $deadline = new \DateTimeImmutable($refundDeadline, $tz);
-            $refundAllowed = $today <= $deadline;
-        } catch (\Throwable $e) {
-            $refundAllowed = true;
-        }
-
-        $tuitionStudents = $registered;
-        if (!$refundAllowed) {
-            $tuitionStudents = array_merge($tuitionStudents, $withdrawn);
-        }
-
-        $tuitionStudents = array_values(array_filter($tuitionStudents, function ($student) use ($schoolYear) {
-            $sid = (int)($student['student_id'] ?? 0);
-            return $sid > 0 && $this->studentClassModel->hasNonEventAssignment($sid, $schoolYear);
-        }));
-
-        // Grade threshold and fees
-        $gradeFee         = (int)($this->configModel->getConfig('grade_fee') ?? 9);
-        $firstStudentFee  = (float)($this->configModel->getConfig('first_student_fee')  ?? 350);
-        $secondStudentFee = (float)($this->configModel->getConfig('second_student_fee') ?? 200);
-        $youthFee         = (float)($this->configModel->getConfig('youth_fee')          ?? 180);
-
-        // Normalize grades for tuition students
-        foreach ($tuitionStudents as &$s) {
-            $name = null;
-            if (!empty($s['class_section_id'])) {
-                $name = $this->classSectionModel->getClassSectionNameBySectionId($s['class_section_id']);
-            }
-            $s['grade_name'] = is_string($name) ? strtoupper(trim($name)) : 'N/A';
-        }
-        unset($s);
-
-        // Count regular vs youth and compute tuition
-        $regularCount = 0;
-        $youthCount   = 0;
-        foreach ($tuitionStudents as $s) {
-            $lvl = $this->parseGradeLevel($s['grade_name']);
-            if ($lvl > $gradeFee) $youthCount++; else $regularCount++;
-        }
-
-        $tuitionSubtotal = 0.0;
-        $tuitionSubtotal += $youthCount * $youthFee;
-        if ($regularCount >= 2) {
-            $tuitionSubtotal += $firstStudentFee + ($regularCount - 1) * $secondStudentFee;
-        } elseif ($regularCount === 1) {
-            $tuitionSubtotal += $firstStudentFee;
-        }
-
-        // ---- Event charges (parent-year) ----
-        $eventSubtotal = 0.0;
-        try {
-            $events = $this->eventChargesModel->getChargesWithEventInfo($parentId, $schoolYear) ?? [];
-            foreach ($events as $ev) { $eventSubtotal += (float)($ev['charged'] ?? 0.0); }
-        } catch (\Throwable $e) {}
-
-        // ---- Additional charges (per-invoice) ----
-        $additionalSubtotal = 0.0;
-        try {
-            $rows = $this->additionalChargeModel
-                ->select('charge_type, amount')
-                ->where('invoice_id', $invoiceId)
-                ->where('status', 'applied')
-                ->findAll();
-            foreach ($rows as $r) {
-                $amt = (float)($r['amount'] ?? 0);
-                $typ = strtolower((string)($r['charge_type'] ?? 'add'));
-                if ($typ === 'deduct') $amt = -abs($amt); else $amt = abs($amt);
-                $additionalSubtotal += $amt;
-            }
-        } catch (\Throwable $e) {}
-
-        $newTotal = round($tuitionSubtotal + $eventSubtotal + $additionalSubtotal, 2);
-
-        // ---- Payments / Discounts / Refunds ----
-        $db        = $this->db;
-        $table     = $this->paymentModel->table;
-        $hasStatus = $db->fieldExists('status', $table);
-        $hasVoid   = $db->fieldExists('is_void', $table);
-        $exclude   = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-
-        $qb = $this->paymentModel
-            ->where('invoice_id', $invoiceId)
-            ->where('school_year', $schoolYear);
-
-        if ($hasStatus) {
-            $qb->groupStart()
-                ->whereNotIn('status', $exclude)
-                ->orWhere('status IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($hasVoid) {
-            $qb->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        $payments = $qb->findAll();
-        $totalPaid = 0.0;
-        foreach ($payments as $p) { $totalPaid += (float)($p['paid_amount'] ?? 0); }
-
-        $discRow = $this->db->table('discount_usages')
-            ->select('COALESCE(SUM(discount_amount),0) AS total_disc')
-            ->where('invoice_id', $invoiceId)
-            ->get()->getRowArray();
-        $totalDisc = (float)($discRow['total_disc'] ?? 0);
-
-        $refundRow = $this->db->table('refunds')
-            ->select('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
-            ->where('invoice_id', $invoiceId)
-            ->whereIn('status', ['Partial','Paid'])
-            ->get()->getRowArray();
-        $totalRefundPaid = (float)($refundRow['total_refund_paid'] ?? 0);
-
-        $newBalance = max(0.0, $newTotal - $totalDisc - $totalPaid - $totalRefundPaid);
-        $newStatus  = ($newBalance <= 0.00001) ? 'Paid' : (($totalPaid > 0) ? 'Partially Paid' : 'Unpaid');
-
-        $this->invoiceModel->update($invoiceId, [
-            'total_amount' => $newTotal,
-            'paid_amount'  => $totalPaid,
-            'balance'      => $newBalance,
-            'status'       => $newStatus,
-        ]);
-    }
-
-    /**
-     * Recalculate invoice totals by invoice number or ID (school-year only).
-     */
-    public function recalculateInvoiceByNumber(string $invoiceNumber)
-    {
-        $invoiceNumber = trim($invoiceNumber);
-        $invoice = null;
-
-        if ($invoiceNumber !== '' && ctype_digit($invoiceNumber)) {
-            $invoice = $this->invoiceModel->find((int)$invoiceNumber);
-        }
-        if (!$invoice) {
-            $invoice = $this->invoiceModel
-                ->where('invoice_number', $invoiceNumber)
-                ->first();
-        }
-
-        if (!$invoice) {
-            return redirect()->back()->with('error', 'Invoice not found.');
-        }
-
-        $schoolYear = (string)($invoice['school_year'] ?? $this->schoolYear);
-        $this->recalculateInvoice((int)$invoice['id'], $schoolYear);
-
-        return redirect()->back()->with('success', 'Invoice recalculated.');
-    }
-
-    /**
-     * Parse a grade name into an integer level for tuition rules.
-     * Kindergarten -> 1, Youth -> > 9, numeric grades passthrough.
-     */
-    private function parseGradeLevel($grade): int
-    {
-        if (is_numeric($grade)) return (int)$grade;
-        if (!is_string($grade)) return 999;
-        $g = strtoupper(trim((string)$grade));
-        $g = preg_replace('/\s+/', ' ', $g);
-        $g = str_replace(['.', '_', '-'], ['', '', ' '], $g);
-        // KG/K/Kindergarten
-        $kg = ['K','KG','K G','KINDER','KINDERGARTEN'];
-        if (in_array($g, $kg, true)) return 1;
-        // Pre-K -> treat below regular
-        $pk = ['PK','P K','PREK','PRE K','PRE KINDER','PREKINDER'];
-        if (in_array($g, $pk, true)) return -1;
-        // Youth variants: Y, YOUTH, Y1, YOUTH2 -> map to 10+
-        if (preg_match('/^Y(?:OUTH)?\s*(\d+)?$/', $g, $m)) {
-            $n = isset($m[1]) && $m[1] !== '' ? max(1, (int)$m[1]) : 1;
-            $gradeFee = (int)($this->configModel->getConfig('grade_fee') ?? 9);
-            return $gradeFee + $n;
-        }
-        if (preg_match('/^(?:GR?ADE\s*)?(\d{1,2})\s*([A-Z]*)$/', $g, $m)) {
-            return (int)$m[1];
-        }
-        return 999;
-    }
-
-    /** Get current invoice balance = total - payments - discounts - refundsPaid (no school_year filter). */
-    private function getCurrentInvoiceBalance(int $invoiceId): float
-    {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) return 0.0;
-
-        $db       = $this->db;
-        $table    = $this->paymentModel->table;        // usually 'payments'
-        $hasStatus = $db->fieldExists('status', $table);
-        $hasVoid  = $db->fieldExists('is_void', $table);
-
-        $qb = $this->paymentModel
-            ->select('COALESCE(SUM(paid_amount),0) AS total_paid')
-            ->where('invoice_id', $invoiceId);
-
-        if ($hasStatus) {
-            $qb->groupStart()
-                ->whereNotIn('status', ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'])
-                ->orWhere('status IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($hasVoid) {
-            $qb->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        $row       = $qb->first();
-        $totalPaid = (float)($row['total_paid'] ?? 0);
-
-        // Discount sum on this invoice
-        $discRow = $this->db->table('discount_usages')
-            ->select('COALESCE(SUM(discount_amount),0) AS total_disc')
-            ->where('invoice_id', $invoiceId)
-            ->get()->getRowArray();
-        $totalDisc = (float)($discRow['total_disc'] ?? 0);
-
-        // Refunds paid
-        $refundRow = $this->db->table('refunds')
-            ->select('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
-            ->where('invoice_id', $invoiceId)
-            ->whereIn('status', ['Partial','Paid'])
-            ->get()->getRowArray();
-        $totalRefundPaid = (float)($refundRow['total_refund_paid'] ?? 0);
-
-        $total     = (float)($invoice['total_amount'] ?? 0);
-
-        return max(0.0, round($total - $totalPaid - $totalDisc - $totalRefundPaid, 2));
-    }
-
-    /** Balance excluding a specific payment (for edit scenarios) and subtracting discounts/refunds. */
-    private function getCurrentInvoiceBalanceExcludingPayment(int $invoiceId, int $excludePaymentId): float
-    {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) return 0.0;
-
-        $db       = $this->db;
-        $table    = $this->paymentModel->table;
-        $hasStatus = $db->fieldExists('status', $table);
-        $hasVoid  = $db->fieldExists('is_void', $table);
-
-        $qb = $this->paymentModel
-            ->select('COALESCE(SUM(paid_amount),0) AS total_paid')
-            ->where('invoice_id', $invoiceId)
-            ->where('id !=', $excludePaymentId);
-
-        if ($hasStatus) {
-            $qb->groupStart()
-                ->whereNotIn('status', ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'])
-                ->orWhere('status IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        if ($hasVoid) {
-            $qb->groupStart()
-                ->where('is_void', 0)
-                ->orWhere('is_void IS NULL', null, false)
-                ->groupEnd();
-        }
-
-        $row       = $qb->first();
-        $totalPaid = (float)($row['total_paid'] ?? 0);
-
-        // Discount sum on this invoice
-        $discRow = $this->db->table('discount_usages')
-            ->select('COALESCE(SUM(discount_amount),0) AS total_disc')
-            ->where('invoice_id', $invoiceId)
-            ->get()->getRowArray();
-        $totalDisc = (float)($discRow['total_disc'] ?? 0);
-
-        // Refunds paid
-        $refundRow = $this->db->table('refunds')
-            ->select('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
-            ->where('invoice_id', $invoiceId)
-            ->whereIn('status', ['Partial','Paid'])
-            ->get()->getRowArray();
-        $totalRefundPaid = (float)($refundRow['total_refund_paid'] ?? 0);
-
-        $total     = (float)($invoice['total_amount'] ?? 0);
-
-        return max(0.0, round($total - $totalPaid - $totalDisc - $totalRefundPaid, 2));
-    }
-
-
-    /**
-     * 🔄 Helper: Get current invoice balance based on actual payments
-     */
-
-    function formatPhone($input)
-    {
-        // Remove any non-digits just in case
-        $digits = preg_replace('/\D/', '', $input);
-
-        if (strlen($digits) !== 10) {
-            return $input; // Return original if not exactly 10 digits
-        }
-
-        return sprintf(
-            '(%s)-%s-%s',
-            substr($digits, 0, 3),
-            substr($digits, 3, 3),
-            substr($digits, 6, 4)
-        );
-    }
-
-    private function processPayment(
-        $invoiceId,
-        $amount,
-        $paymentMethod,
-        $checkFile = null,
-        $transactionId = null,
-        $paymentDate = null,
-        $schoolYear = null,
-        $semester = null,
-        $checkNumber = null,
-        ?int $installmentSeq = null // <-- NOW: the installment sequence (1,2,3,...) for this invoice
-    ) {
-        $invoice = $this->invoiceModel->find($invoiceId);
-        if (!$invoice) {
-            return false;
-        }
-
-        $transactionId = $transactionId ?? 'INV-' . $invoiceId . '-' . time();
-        $paymentDate   = $paymentDate   ?? utc_now();
-
-        // If sequence wasn't provided (legacy callers), compute it here.
-        // NOTE: If you call this from inside a transaction (recommended), this will be consistent.
-        if ($installmentSeq === null || $installmentSeq < 1) {
-            $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-            $priorCount = $this->paymentModel
-                ->where('invoice_id', $invoiceId)
-                ->where('paid_amount >', 0)
-                ->whereNotIn('status', $exclude)
-                ->countAllResults();
-            $installmentSeq = $priorCount + 1;
-        }
-
-
-        // Compute new totals
-        $newPaid    = (float) $invoice['paid_amount'] + (float) $amount;
-        $newBalance = (float) $invoice['balance'] - (float) $amount;
-        if ($newBalance == $invoice['total_amount']) {
-            $paymentStatus = 'Unpaid';
-        } elseif ($newBalance > 0 && $newBalance < $invoice['total_amount']) {
-            $paymentStatus = 'Partially Paid';
-        } elseif ($newBalance <= 0.00001) {
-            $paymentStatus = 'Paid';
-        } else {
-            $paymentStatus = $invoice['status']; // fallback
-        }
-
-        // Update invoice
-        $invoiceUpdateData = [
-            'paid_amount' => $newPaid,
-            'balance'     => $newBalance,
-            'status'      => $paymentStatus,
-            'updated_by'  => session()->get('user_id'),
-        ];
-        if (!$this->invoiceModel->update($invoiceId, $invoiceUpdateData)) {
-            return false;
-        }
-
-        // Store the *sequence* in number_of_installments (kept for schema compatibility)
-        // Consider renaming the column to `installment_seq` in a future migration.
-        $paymentData = [
-            'parent_id'              => $invoice['parent_id'],
-            'invoice_id'             => $invoiceId,
-            'total_amount'           => $invoice['total_amount'],
-            'paid_amount'            => $amount,
-            'balance'                => $newBalance,
-            'number_of_installments' => $installmentSeq, // <-- installment sequence (1,2,3,...)
-            'transaction_id'         => $transactionId,
-            'payment_method'         => strtolower($paymentMethod),
-            'payment_date'           => $paymentDate,
-            'status'                 => $paymentStatus,
-            'check_file'             => $checkFile,
-            'check_number'           => (strtolower($paymentMethod) === 'check') ? $checkNumber : null,
-            'updated_by'             => session()->get('user_id'),
-            'school_year'            => $schoolYear ?? $this->schoolYear,
-            'semester'               => $semester   ?? $this->semester,
-            // 'installment_index'    => $installmentSeq, // use if you add a dedicated column later
-        ];
-
-        if (!$this->paymentModel->insert($paymentData)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    private function getSuccessfulPaymentCount(int $invoiceId): int
-    {
-        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
-
-        return $this->paymentModel
-            ->where('invoice_id', $invoiceId)
-            ->where('paid_amount >', 0)
-            ->whereNotIn('status', $exclude)
-            ->countAllResults();
-    }
-
-    public function serveCheckFile($filename, $mode = 'download')
-    {
-        $filename = basename($filename);
-        $roots = [
-            WRITEPATH . 'uploads/checks/' . $filename,
-            WRITEPATH . 'uploads/cards/'  . $filename,
-            WRITEPATH . 'uploads/misc/'   . $filename,
-            WRITEPATH . 'uploads/'        . $filename, // final fallback
-        ];
-
-        $path = null;
-        foreach ($roots as $candidate) {
-            if (is_file($candidate)) {
-                $path = $candidate;
-                break;
-            }
-        }
-
-        if (!$path) {
-            throw new \CodeIgniter\Exceptions\PageNotFoundException('Payment file not found: ' . esc($filename));
-        }
-
-        if ($mode === 'inline') {
-            return $this->response
-                ->setHeader('Content-Type', mime_content_type($path))
-                ->setHeader('Content-Disposition', 'inline; filename="' . $filename . '"')
-                ->setBody(file_get_contents($path));
-        }
-
-        return $this->response->download($path, null);
-    }
-}
diff --git a/app/Http/Controllers/old/PaymentNotificationController.php b/app/Http/Controllers/old/PaymentNotificationController.php
deleted file mode 100644
index 17eed995..00000000
--- a/app/Http/Controllers/old/PaymentNotificationController.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-use App\Controllers\BaseController;
-use App\Models\PaymentNotificationLogModel;
-use App\Models\UserModel;
-use App\Models\ConfigurationModel;
-use App\Models\InvoiceModel;
-use App\Models\PaymentModel;
-use App\Models\FamilyGuardianModel;
-use App\Services\EmailService;
-use App\Services\NotificationService;
-
-class PaymentNotificationController extends BaseController
-{
-    protected PaymentNotificationLogModel $logModel;
-    protected UserModel $userModel;
-    protected ConfigurationModel $configModel;
-    protected InvoiceModel $invoiceModel;
-    protected PaymentModel $paymentModel;
-    protected FamilyGuardianModel $familyGuardianModel;
-    protected EmailService $emailService;
-
-    public function __construct()
-    {
-        $this->logModel  = new PaymentNotificationLogModel();
-        $this->userModel = new UserModel();
-        $this->configModel = new ConfigurationModel();
-        $this->invoiceModel = new InvoiceModel();
-        $this->paymentModel = new PaymentModel();
-        $this->familyGuardianModel = new FamilyGuardianModel();
-        $this->emailService = new EmailService();
-    }
-
-    public function index()
-    {
-        helper(['form', 'url']);
-
-        $from = $this->request->getGet('from');
-        $to   = $this->request->getGet('to');
-        $type = $this->request->getGet('type');
-
-        $rows = $this->logModel->listLogs($from, $to, $type);
-
-        // Preload parent names
-        $parents = [];
-        foreach ($rows as $r) {
-            $pid = (int) ($r['parent_id'] ?? 0);
-            if ($pid && !isset($parents[$pid])) {
-                $u = $this->userModel->select('firstname,lastname')->find($pid);
-                $parents[$pid] = trim(($u['firstname'] ?? '') . ' ' . ($u['lastname'] ?? ''));
-            }
-        }
-
-        return view('payment/notification_management', [
-            'logs'        => $rows,
-            'parentsById' => $parents,
-            'filters'     => ['from' => $from, 'to' => $to, 'type' => $type],
-        ]);
-    }
-
-    private function wantsJson(): bool
-    {
-        $accept = strtolower((string)($this->request->getHeaderLine('Accept') ?? ''));
-        $fmt    = strtolower((string)($this->request->getGet('format') ?? $this->request->getPost('format') ?? ''));
-        return $this->request->isAJAX() || str_contains($accept, 'application/json') || $fmt === 'json';
-    }
-
-    /**
-     * POST /api/payments/notifications/send
-     * Body: parent_id? (int), type? ('no_payment'|'installment'), school_year?
-     * - When parent_id provided: send for that parent only (if balance > 0 or force=1)
-     * - Otherwise: send to all parents with positive balance for selected school year
-     *   respecting idempotency (1 email per month/type) unless force=1.
-     */
-    public function send()
-    {
-        $parentId   = (int)($this->request->getPost('parent_id') ?? 0);
-        $typeInput  = (string)($this->request->getPost('type') ?? '');
-        $force      = (int)($this->request->getPost('force') ?? 0) === 1;
-        $schoolYear = (string)($this->request->getPost('school_year') ?? ($this->configModel->getConfig('school_year') ?? date('Y')));
-        $returnTo   = (string)($this->request->getPost('return_to') ?? '');
-
-        $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-        $tz   = new \DateTimeZone($tzName);
-        $now  = new \DateTime('now', $tz);
-        $year = (int)$now->format('Y');
-        $month= (int)$now->format('n');
-
-        // Helper: compute current total balance across invoices for this parent/year
-        $computeBalance = function (int $pid) use ($schoolYear): array {
-            $db = \Config\Database::connect();
-            $rows = $db->table('invoices')
-                ->select('id, total_amount')
-                ->where('parent_id', $pid)
-                ->where('school_year', $schoolYear)
-                ->get()->getResultArray();
-            $paymentsTbl = 'payments';
-            $hasStatus   = $db->fieldExists('status', $paymentsTbl);
-            $hasVoid     = $db->fieldExists('is_void', $paymentsTbl);
-
-            $sumBalance = 0.0; $latestId = null;
-            foreach ($rows as $ir) {
-                $iid = (int)$ir['id'];
-                if ($latestId === null) $latestId = $iid;
-                $total = (float)($ir['total_amount'] ?? 0);
-
-                $qb = $db->table('payments')->select('COALESCE(SUM(paid_amount),0) AS tot')->where('invoice_id', $iid);
-                if ($hasStatus) {
-                    $qb->groupStart()
-                        ->whereNotIn('status', ['void','voided','refunded','failed','chargeback','declined','reversed','canceled','cancelled'])
-                        ->orWhere('status IS NULL', null, false)
-                       ->groupEnd();
-                }
-                if ($hasVoid) {
-                    $qb->groupStart()
-                        ->where('is_void', 0)
-                        ->orWhere('is_void IS NULL', null, false)
-                       ->groupEnd();
-                }
-                $paid = (float)($qb->get()->getRowArray()['tot'] ?? 0);
-
-                $disc = (float)($db->table('discount_usages')->select('COALESCE(SUM(discount_amount),0) AS tot')->where('invoice_id', $iid)->get()->getRowArray()['tot'] ?? 0);
-                $rfnd = (float)($db->table('refunds')->select('COALESCE(SUM(refund_paid_amount),0) AS tot')->where('invoice_id', $iid)->whereIn('status', ['Partial','Paid'])->get()->getRowArray()['tot'] ?? 0);
-
-                $sumBalance += max(0.0, round($total - $disc - $paid - $rfnd, 2));
-            }
-            return [$sumBalance, $latestId];
-        };
-
-        // Helper: get secondary guardian email
-        $getSecondary = function (int $primaryUserId): ?string {
-            $row = $this->familyGuardianModel->where('user_id', $primaryUserId)->first();
-            if (!$row || empty($row['family_id'])) return null;
-            $others = $this->familyGuardianModel
-                ->where('family_id', (int)$row['family_id'])
-                ->where('user_id !=', $primaryUserId)
-                ->where('receive_emails', 1)
-                ->findAll();
-            foreach ($others as $g) {
-                $email = $this->userModel->select('email')->find((int)$g['user_id'])['email'] ?? null;
-                if ($email && filter_var($email, FILTER_VALIDATE_EMAIL)) return $email;
-            }
-            return null;
-        };
-
-        // Compose subject/body using same content as CLI command
-        $compose = function (int $pid, float $balance) use ($schoolYear, $now): array {
-            $u = $this->userModel->find($pid) ?: [];
-            $parentName = trim(($u['firstname'] ?? '') . ' ' . ($u['lastname'] ?? ''));
-            $greeting   = $parentName !== '' ? "Dear {$parentName}," : 'Dear Parent,';
-            $monthYear  = $now->format('F Y');
-            $subject    = sprintf('Monthly Tuition Reminder — %s', $schoolYear);
-            $balanceFmt = '$' . number_format($balance, 2);
-            $intro = 'This is your monthly installment reminder for ' . $schoolYear . '.';
-            // Compute remaining/max installments similar to Manual Payment UI
-            $installmentEndRaw = (string)$this->configModel->getConfig('installment_date');
-            $tzName = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-            $tz = new \DateTimeZone($tzName);
-            $today = new \DateTimeImmutable('today', $tz);
-            $end = null; try { if ($installmentEndRaw) { $end = new \DateTimeImmutable($installmentEndRaw, $tz); } } catch (\Throwable $e) { $end = null; }
-            $remMonths = 0;
-            if ($end) {
-                $y = (int)$end->format('Y') - (int)$today->format('Y');
-                $m = (int)$end->format('n') - (int)$today->format('n');
-                $remMonths = $y * 12 + $m;
-                if ((int)$end->format('j') > (int)$today->format('j')) $remMonths += 1;
-                if ($remMonths < 0) $remMonths = 0;
-            }
-            $remainingInst = max(1, $remMonths);
-            $maxInst = max(($remMonths ?: 0), ($balance > 0 ? 2 : 0));
-            $instDueFmt = '$' . number_format($remainingInst > 0 ? ($balance / $remainingInst) : 0, 2);
-            $bodyHtml = <<<HTML
-                <div style="font-family:Arial,Helvetica,sans-serif; font-size:14px; color:#212529; line-height:1.5;">
-                  <h2 style="margin:0 0 10px; font-size:18px;">Monthly Tuition Reminder</h2>
-                  <p>{$greeting}</p>
-                  <p>{$intro}</p>
-                  <p><strong>Current Outstanding Balance:</strong> {$balanceFmt}</p>
-                  <ul>
-                    <li><strong>Remaining installments:</strong> {$remainingInst}</li>
-                    <li><strong>Suggested installment this month:</strong> {$instDueFmt}</li>
-                    <li><strong>Maximum installments available:</strong> {$maxInst}</li>
-                  </ul>
-                  <p>As a friendly reminder, our tuition installments are due at the beginning of each month.</p>
-                  <p>You can review your invoice and payment options by logging in to your parent portal.</p>
-                  <p>Thank you for your prompt attention.</p>
-                  <p><em>Reminder Period:</em> {$monthYear}</p>
-                </div>
-            HTML;
-            $body = view('emails/_wrap_layout', [ 'title' => 'Monthly Tuition Reminder', 'body_html' => $bodyHtml ], ['saveData' => true]);
-            return [$subject, $body];
-        };
-
-        $results = [ 'sent' => 0, 'skipped' => 0, 'failed' => 0, 'details' => [] ];
-
-        if ($parentId > 0) {
-            [$balance, $latestInv] = $computeBalance($parentId);
-
-            // detect type if not provided
-            if ($typeInput === 'no_payment' || $typeInput === 'installment') {
-                $type = $typeInput;
-            } else {
-                $hasPayments = $this->paymentModel
-                    ->where('parent_id', $parentId)
-                    ->where('school_year', $schoolYear)
-                    ->countAllResults() > 0;
-                $type = $hasPayments ? 'installment' : 'no_payment';
-            }
-
-            // Idempotency: skip if already sent this month for this type
-            if (!$force && $this->logModel->existsForPeriod($parentId, $year, $month, $type)) {
-                $results['skipped']++;
-                $results['details'][] = ['parent_id' => $parentId, 'result' => 'already_sent'];
-            } else {
-                
-                if ($balance <= 0 && !$force) {
-                    $results['skipped']++;
-                    $results['details'][] = ['parent_id' => $parentId, 'result' => 'no_balance'];
-                // For HTML submit, redirect back with details
-                if (!$this->wantsJson()) {
-                    $dest = $returnTo !== '' ? $returnTo : site_url('payment/unpaid-parents?school_year=' . rawurlencode($schoolYear));
-                    return redirect()->to($dest)->with('status', 'No balance to remind this parent.');
-                }
-            } else {
-                // Compute current-month installment suggestion
-                $installmentEndRaw = (string)$this->configModel->getConfig('installment_date');
-                $tzName   = (string) (config('School')->attendance['timezone'] ?? user_timezone());
-                $tz   = new \DateTimeZone($tzName);
-                $nowD = new \DateTimeImmutable('today', $tz);
-                $endD = null; try { if ($installmentEndRaw) $endD = new \DateTimeImmutable($installmentEndRaw, $tz); } catch (\Throwable $e) { $endD = null; }
-                $remMonths = 0;
-                if ($endD) {
-                    $y = (int)$endD->format('Y') - (int)$nowD->format('Y');
-                    $m = (int)$endD->format('n') - (int)$nowD->format('n');
-                    $remMonths = $y * 12 + $m;
-                    if ((int)$endD->format('j') > (int)$nowD->format('j')) $remMonths += 1;
-                    if ($remMonths < 0) $remMonths = 0;
-                }
-                $remInst = max(1, $remMonths);
-                $instDue = round($balance / $remInst, 2);
-                $toEmail = $this->userModel->select('email')->find($parentId)['email'] ?? null;
-                $toEmail = $toEmail && filter_var($toEmail, FILTER_VALIDATE_EMAIL) ? $toEmail : null;
-                $ccEmail = $getSecondary($parentId);
-                [$subject, $body] = $compose($parentId, $balance);
-
-                $ok = $toEmail ? $this->emailService->send($toEmail, $subject, $body, 'finance') : false;
-                if ($ok && $ccEmail && strcasecmp($ccEmail, (string)$toEmail) !== 0) {
-                    $this->emailService->send($ccEmail, $subject, $body, 'finance');
-                }
-
-                $this->logModel->insert([
-                    'parent_id'        => $parentId,
-                    'invoice_id'       => $latestInv,
-                    'school_year'      => $schoolYear,
-                    'period_year'      => $year,
-                    'period_month'     => $month,
-                    'type'             => $type,
-                    'to_email'         => $toEmail,
-                    'cc_email'         => $ccEmail,
-                    'head_fa_notified' => 0,
-                    'subject'          => $subject,
-                    'body'             => $body,
-                    'status'           => $ok ? 'sent' : 'failed',
-                    'error_message'    => $ok ? null : 'Missing/invalid email or send failed',
-                    'balance_snapshot' => $balance,
-                    'sent_at'          => $now->format('Y-m-d H:i:s'),
-                ]);
-
-                if ($ok) { $results['sent']++; $results['details'][] = ['parent_id' => $parentId, 'result' => 'sent', 'balance' => $balance, 'installment_due' => $instDue, 'remaining' => $remInst]; }
-                else { $results['failed']++; $results['details'][] = ['parent_id' => $parentId, 'result' => 'failed']; }
-
-                // For HTML submit, redirect back with detailed message
-                if (!$this->wantsJson()) {
-                    $dest = $returnTo !== '' ? $returnTo : site_url('payment/unpaid-parents?school_year=' . rawurlencode($schoolYear));
-                    $msg = sprintf('Reminder sent. Remaining balance: $%s. Current installment due: $%s. Remaining installments: %d',
-                        number_format($balance, 2), number_format($instDue, 2), (int)$remInst);
-                    return redirect()->to($dest)->with('status', $msg);
-                }
-            }
-        }
-
-        // Single-parent branch handled; otherwise do bulk
-        } else {
-
-        // Bulk: parents with positive balance in selected year
-        $db = \Config\Database::connect();
-        $rows = $db->table('invoices')
-            ->select('DISTINCT parent_id', false)
-            ->where('school_year', $schoolYear)
-            ->get()->getResultArray();
-        $pids = array_values(array_unique(array_map(static fn($r) => (int)$r['parent_id'], $rows)));
-
-        foreach ($pids as $pid) {
-            [$balance, $latestInv] = $computeBalance($pid);
-            if ($balance <= 0 && !$force) { $results['skipped']++; continue; }
-
-            $hasPayments = $this->paymentModel
-                ->where('parent_id', $pid)
-                ->where('school_year', $schoolYear)
-                ->countAllResults() > 0;
-            $type = $hasPayments ? 'installment' : 'no_payment';
-
-            if (!$force && $this->logModel->existsForPeriod($pid, $year, $month, $type)) { $results['skipped']++; continue; }
-
-            $toEmail = $this->userModel->select('email')->find($pid)['email'] ?? null;
-            $toEmail = $toEmail && filter_var($toEmail, FILTER_VALIDATE_EMAIL) ? $toEmail : null;
-            $ccEmail = $getSecondary($pid);
-            [$subject, $body] = $compose($pid, $balance);
-
-            $ok = $toEmail ? $this->emailService->send($toEmail, $subject, $body, 'finance') : false;
-            if ($ok && $ccEmail && strcasecmp($ccEmail, (string)$toEmail) !== 0) {
-                $this->emailService->send($ccEmail, $subject, $body, 'finance');
-            }
-
-            // Optional: notify head of finance in-app
-            foreach ($this->getHeadOfFinanceUsers() as $u) {
-                NotificationService::toUser((int)$u['id'], 'Payment Reminder Sent',
-                    sprintf('A %s reminder was sent to parent #%d (balance: $%0.2f).', $type, $pid, $balance),
-                    ['in_app']
-                );
-            }
-
-            $this->logModel->insert([
-                'parent_id'        => $pid,
-                'invoice_id'       => $latestInv,
-                'school_year'      => $schoolYear,
-                'period_year'      => $year,
-                'period_month'     => $month,
-                'type'             => $type,
-                'to_email'         => $toEmail,
-                'cc_email'         => $ccEmail,
-                'head_fa_notified' => 1,
-                'subject'          => $subject,
-                'body'             => $body,
-                'status'           => $ok ? 'sent' : 'failed',
-                'error_message'    => $ok ? null : 'Missing/invalid email or send failed',
-                'balance_snapshot' => $balance,
-                'sent_at'          => $now->format('Y-m-d H:i:s'),
-            ]);
-
-            if ($ok) $results['sent']++; else $results['failed']++;
-        }
-
-        }
-
-        // Respond
-        if ($this->wantsJson()) {
-            return $this->response->setJSON(['ok' => true] + $results + [
-                'csrf_token' => csrf_token(), 'csrf_hash' => csrf_hash(),
-            ]);
-        }
-
-        $msg = sprintf('Reminders — sent: %d, skipped: %d, failed: %d', (int)$results['sent'], (int)$results['skipped'], (int)$results['failed']);
-        $dest = $returnTo !== '' ? $returnTo : site_url('payment/unpaid-parents?school_year=' . rawurlencode($schoolYear));
-        return redirect()->to($dest)->with('status', $msg);
-    }
-
-    private function getHeadOfFinanceUsers(): array
-    {
-        $heads = $this->userModel->getUsersByRole('head of department (finance)');
-        if (!empty($heads)) return $heads;
-        $acct = $this->userModel->getUsersByRole('accountant');
-        return $acct ?: [];
-    }
-}
diff --git a/app/Http/Controllers/old/PaymentTransactionController.php b/app/Http/Controllers/old/PaymentTransactionController.php
deleted file mode 100644
index 461f51d7..00000000
--- a/app/Http/Controllers/old/PaymentTransactionController.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\PaymentTransactionModel;
-use CodeIgniter\RESTful\ResourceController;
-
-class PaymentTransactionController extends ResourceController
-{
-    protected $paymentTransactionModel;
-
-    public function __construct()
-    {
-        $this->paymentTransactionModel = new PaymentTransactionModel();
-    }
-
-    // API: Create a new payment transaction (installment)
-    public function createAPI()
-    {
-        $data = [
-            'transaction_id' => $this->request->getPost('transaction_id'),
-            'payment_id' => $this->request->getPost('payment_id'),
-            'transaction_date' => $this->request->getPost('transaction_date'),
-            'amount' => $this->request->getPost('amount'),
-            'payment_method' => $this->request->getPost('payment_method'),
-            'payment_status' => 'Pending',
-            'transaction_fee' => $this->request->getPost('transaction_fee'),
-            'payment_reference' => $this->request->getPost('payment_reference'),
-            'is_full_payment' => $this->request->getPost('is_full_payment') ? 1 : 0,
-        ];
-
-        if ($this->paymentTransactionModel->save($data)) {
-            return $this->respondCreated($data);
-        } else {
-            return $this->failValidationErrors($this->paymentTransactionModel->errors());
-        }
-    }
-
-    // API: Get all transactions for a specific payment
-    public function getByPaymentAPI($paymentId)
-    {
-        $transactions = $this->paymentTransactionModel->getTransactionsByPaymentId($paymentId);
-        if ($transactions) {
-            return $this->respond($transactions);
-        } else {
-            return $this->failNotFound('Transactions not found for the payment.');
-        }
-    }
-
-    // View: Get all transactions for a specific payment (for web views)
-    public function getByPayment($paymentId)
-    {
-        $transactions = $this->paymentTransactionModel->getTransactionsByPaymentId($paymentId);
-        return view('payment_transaction_list', ['transactions' => $transactions]);
-    }
-
-    // View: Create a new payment transaction
-    public function create()
-    {
-        return view('payment_transaction_create');
-    }
-
-    // API: Update payment status by transaction ID
-    public function updateStatusAPI($transactionId)
-    {
-        $status = $this->request->getPost('status');
-        if ($this->paymentTransactionModel->updateTransactionStatus($transactionId, $status)) {
-            return $this->respond(['status' => 'success']);
-        } else {
-            return $this->failNotFound('Transaction not found.');
-        }
-    }
-
-    // View: Update payment status by transaction ID
-    public function updateStatus($transactionId)
-    {
-        $status = $this->request->getPost('status');
-        if ($this->paymentTransactionModel->updateTransactionStatus($transactionId, $status)) {
-            return redirect()->to('/payment_transactions');
-        } else {
-            return redirect()->back()->with('error', 'Failed to update status.');
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/old/PaypalTransactionsController.php b/app/Http/Controllers/old/PaypalTransactionsController.php
deleted file mode 100644
index 370d991c..00000000
--- a/app/Http/Controllers/old/PaypalTransactionsController.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\PayPalPaymentModel;
-use App\Models\PaymentModel;
-use App\Models\UserModel;
-use App\Models\ConfigurationModel;
-use App\Models\InvoiceModel;
-
-class PaypalTransactionsController extends BaseController
-{
-    public function index()
-    {
-        $model = new PayPalPaymentModel();
-
-        $keyword = $this->request->getGet('q');
-        $perPage = 10;
-
-        if ($keyword) {
-            $transactions = $model
-                ->groupStart()
-                    ->like('transaction_id', $keyword)
-                    ->orLike('payer_email', $keyword)
-                    ->orLike('event_type', $keyword)
-                    ->orLike('order_id', $keyword)
-                    ->orLike('parent_school_id', $keyword)
-                ->groupEnd()
-                ->orderBy('created_at', 'DESC')
-                ->paginate($perPage);
-        } else {
-            $transactions = $model
-                ->orderBy('created_at', 'DESC')
-                ->paginate($perPage);
-        }
-
-        return view('administrator/paypal_transactions', [
-            'transactions' => $transactions,
-            'pager' => $model->pager,
-            'keyword' => $keyword
-        ]);
-    }
-
-    public function exportCsv()
-    {
-        $model = new PayPalPaymentModel();
-        $keyword = $this->request->getGet('q');
-
-        if ($keyword) {
-            $transactions = $model
-                ->groupStart()
-                    ->like('transaction_id', $keyword)
-                    ->orLike('payer_email', $keyword)
-                    ->orLike('event_type', $keyword)
-                    ->orLike('order_id', $keyword)
-                    ->orLike('parent_school_id', $keyword)
-                ->groupEnd()
-                ->orderBy('created_at', 'DESC')
-                ->findAll();
-        } else {
-            $transactions = $model->orderBy('created_at', 'DESC')->findAll();
-        }
-
-        $filename = 'paypal_transactions_' . date('Ymd_His') . '.csv';
-
-        header('Content-Type: text/csv');
-        header("Content-Disposition: attachment; filename=\"$filename\"");
-
-        $output = fopen('php://output', 'w');
-
-        // CSV headers
-        fputcsv($output, [
-            'ID', 'Transaction ID', 'Order ID', 'Parent School ID',
-            'Email', 'Amount', 'Net Amount', 'Currency',
-            'Status', 'Event Type', 'Created At'
-        ]);
-
-        foreach ($transactions as $t) {
-            fputcsv($output, [
-                $t['id'],
-                $t['transaction_id'],
-                $t['order_id'],
-                $t['parent_school_id'],
-                $t['payer_email'],
-                $t['amount'],
-                $t['net_amount'],
-                $t['currency'],
-                $t['status'],
-                $t['event_type'],
-                $t['created_at'],
-            ]);
-        }
-
-        fclose($output);
-        exit;
-    }
-
-}
diff --git a/app/Http/Controllers/old/PhoneFormatterService.php b/app/Http/Controllers/old/PhoneFormatterService.php
new file mode 100644
index 00000000..9cd47f76
--- /dev/null
+++ b/app/Http/Controllers/old/PhoneFormatterService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Services;
+
+class PhoneFormatterService
+{
+    /**
+     * Format a raw phone number to (xxx)-xxx-xxxx format
+     *
+     * @param string $number
+     * @return string|null
+     */
+    public function formatPhoneNumber(string $number): ?string
+    {
+        // Remove non-digit characters
+        $digits = preg_replace('/\D/', '', $number);
+
+        // Ensure it's exactly 10 digits
+        if (strlen($digits) === 10) {
+            return sprintf(
+                '%s-%s-%s',
+                substr($digits, 0, 3),
+                substr($digits, 3, 3),
+                substr($digits, 6)
+            );
+        }
+
+        // Invalid number
+        return null;
+    }
+}
diff --git a/app/Http/Controllers/old/ProjectController.php b/app/Http/Controllers/old/ProjectController.php
deleted file mode 100644
index 21eea661..00000000
--- a/app/Http/Controllers/old/ProjectController.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\ProjectModel;
-use App\Models\StudentModel;
-use App\Models\StudentClassModel;
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\ConfigurationModel;
-use RuntimeException;
-use App\Services\SemesterScoreService;
-use Config\Services;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-
-class ProjectController extends Controller
-{
-    protected $db;
-    protected ConfigurationModel $configModel;
-    protected string $schoolYear;
-    protected $semesterScoreService;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-        $this->semesterScoreService = service('semesterScoreService');
-        $this->db = \Config\Database::connect();
-        $this->configModel = new ConfigurationModel();
-        $this->schoolYear = (string) ($this->configModel->getConfig('school_year') ?? '');
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-    }
-
-    public function addProject()
-    {
-        $updatedBy = session()->get('user_id');
-        $teacherClassModel = new TeacherClassModel();
-        $studentClassModel = new StudentClassModel();
-        $studentModel = new StudentModel();
-        $projectModel = new ProjectModel();
-
-        $teacherClass = $teacherClassModel->where('teacher_id', $updatedBy)->first();
-        if (!$teacherClass) {
-            return redirect()->back()->with('status', 'No class section found for the current teacher.');
-        }
-
-        $classSectionId = $teacherClass['class_section_id'];
-        session()->set('class_section_id', $classSectionId);
-
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->getTeacherSchoolYear();
-
-        $projectRows = $projectModel
-            ->select('id, project_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->orderBy('project_index', 'ASC')
-            ->findAll();
-
-        $projectHeaders = [];
-        foreach ($projectRows as $row) {
-            $projectHeaders[$row['project_index']][] = $row['id'];
-        }
-
-        $headerLabels = array_keys($projectHeaders);
-
-        $studentsClasses = $studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
-        $students = [];
-
-        foreach ($studentsClasses as $studentClass) {
-            $studentId = $studentClass['student_id'];
-            $student = $studentModel
-                ->where('id', $studentId)
-                ->where('is_active', 1)
-                ->first();
-
-            if ($student) {
-                $scores = [];
-                foreach ($projectHeaders as $index => $ids) {
-                    $entry = $projectModel
-                        ->where('student_id', $studentId)
-                        ->where('project_index', $index)
-                        ->where('class_section_id', $classSectionId)
-                        ->where('semester', $semester)
-                        ->where('school_year', $schoolYear)
-                        ->first();
-
-                    $scores[$index] = $entry['score'] ?? '';
-                }
-
-                $students[] = [
-                    'student_id' => $studentId,
-                    'firstname'  => $student['firstname'],
-                    'lastname'   => $student['lastname'],
-                    'scores'     => $scores
-                ];
-            }
-        }
-
-        usort($students, fn($a, $b) => strcmp($a['lastname'], $b['lastname']) ?: strcmp($a['firstname'], $b['firstname']));
-
-        return view('/teacher/add_project', [
-            'students' => $students,
-            'projectHeaders' => $headerLabels,
-            'semester' => $semester,
-            'schoolYear' => $schoolYear,
-            'missingOkMap' => $this->missingScoreOverrideModel->getOverridesMap($classSectionId, $semester, $schoolYear, 'project'),
-        ]);
-    }
-
-    public function updateProjectScores(array $scores = null, int $updatedBy = null, int $classSectionId = null)
-    {
-        $scores = $this->request->getPost('scores');
-        $projectModel = new ProjectModel();
-        $studentModel = new StudentModel();
-
-        if ($updatedBy === null) {
-            $updatedBy = session()->get('user_id');
-        }
-        $classSectionId = session()->get('class_section_id');
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->getTeacherSchoolYear();
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if (!is_array($scores)) {
-            return redirect()->back()->with('error', 'No project scores submitted.');
-        }
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-        $studentIds = array_keys($scores);
-        $indexSet = [];
-        foreach ($scores as $studentId => $projects) {
-            if (!is_array($projects)) {
-                continue;
-            }
-            foreach ($projects as $index => $score) {
-                if (is_numeric($index)) {
-                    $indexSet[(int)$index] = true;
-                }
-            }
-        }
-        $checkedItems = [];
-        if (is_array($missingOk)) {
-            foreach ($missingOk as $studentId => $indexes) {
-                if (!is_array($indexes)) {
-                    continue;
-                }
-                foreach ($indexes as $index => $flag) {
-                    if (!is_numeric($index)) {
-                        continue;
-                    }
-                    $checkedItems[] = [
-                        'student_id' => (int) $studentId,
-                        'item_index' => (int) $index,
-                    ];
-                }
-            }
-        }
-        $this->missingScoreOverrideModel->replaceOverrides(
-            $classSectionId,
-            (string) $semester,
-            (string) $schoolYear,
-            'project',
-            $studentIds,
-            array_keys($indexSet),
-            $checkedItems,
-            $updatedBy
-        );
-
-        foreach ($scores as $studentId => $projects) {
-            if (!is_numeric($studentId)) continue;
-
-            $student = $studentModel->find($studentId);
-            if (!$student) continue;
-
-            foreach ($projects as $index => $score) {
-                $normalizedScore = is_numeric($score) ? (float) $score : null;
-
-                $existing = $projectModel->where([
-                    'student_id' => $studentId,
-                    'project_index' => $index,
-                    'class_section_id' => $classSectionId,
-                    'semester' => $semester
-                ])->first();
-
-                $data = [
-                    'student_id' => $studentId,
-                    'school_id' => $student['school_id'],
-                    'class_section_id' => $classSectionId,
-                    'updated_by' => $updatedBy,
-                    'project_index' => $index,
-                    'score' => $normalizedScore,
-                    'semester' => $semester,
-                    'school_year' => $schoolYear,
-                    'updated_at' => utc_now(),
-                ];
-
-                if ($existing) {
-                    $projectModel->update($existing['id'], $data);
-                } else {
-                    $data['created_at'] = utc_now();
-                    $projectModel->insert($data);
-                }
-            }
-        }
-
-        $studentTeacherInfo = $studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        return redirect()->to(base_url('/teacher/addProject'))->with('status', 'Project scores updated successfully.');
-    }
-
-    public function addNextProjectColumn()
-    {
-        $updatedBy = session()->get('user_id');
-        $classSectionId = session()->get('class_section_id');
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->getTeacherSchoolYear();
-
-        $projectModel = new ProjectModel();
-        $studentClassModel = new StudentClassModel();
-
-        $existingIndexes = $projectModel
-            ->select('project_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('updated_by', $updatedBy)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->groupBy('project_index')
-            ->orderBy('project_index', 'DESC')
-            ->findAll();
-
-        $maxIndex = 0;
-        foreach ($existingIndexes as $row) {
-            if (isset($row['project_index']) && is_numeric($row['project_index'])) {
-                $maxIndex = max($maxIndex, (int)$row['project_index']);
-            }
-        }
-
-        $nextIndex = $maxIndex + 1;
-
-        $students = $studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
-
-        foreach ($students as $student) {
-            $exists = $projectModel->where([
-                'student_id' => $student['student_id'],
-                'project_index' => $nextIndex,
-                'class_section_id' => $classSectionId,
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-            ])->first();
-
-            if (!$exists) {
-                $projectModel->insert([
-                    'student_id' => $student['student_id'],
-                    'class_section_id' => $classSectionId,
-                    'updated_by' => $updatedBy,
-                    'project_index' => $nextIndex,
-                    'score' => null,
-                    'semester' => $semester,
-                    'school_year' => $schoolYear,
-                    'created_at' => utc_now(),
-                    'updated_at' => utc_now()
-                ]);
-            }
-        }
-
-        return $this->response->setJSON([
-            'status' => 'success',
-            'project_index' => $nextIndex
-        ]);
-    }
-
-    public function showProjectMngt()
-    {
-        // Accept POST first, then GET (query string), then session fallback
-        $incomingId = $this->request->getPost('class_section_id');
-        if (!$incomingId) {
-            $incomingId = $this->request->getGet('class_section_id');
-        }
-
-        $classSectionId = (int) ($incomingId ?: (session()->get('class_section_id') ?? 0));
-
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'No class section found for the current teacher or selection.');
-        }
-
-        session()->set('class_section_id', $classSectionId);
-
-        $semester   = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->getTeacherSchoolYear();
-        $projectScores = $this->getProjectScoresByStudent($classSectionId, $semester, $schoolYear);
-        $students = $this->getStudentsByClassSectionAndYear($classSectionId, $schoolYear);
-        $projectHeaders = $this->getProjectHeaders($classSectionId, $semester, $schoolYear);
-        $scoresLocked = $this->isScoresLocked($classSectionId, $semester, $schoolYear);
-
-        return view('grading/project', [
-            'projectScores'     => $projectScores,
-            'students'          => $students,
-            'semester'          => $semester,
-            'schoolYear'        => $schoolYear,
-            'projectHeaders'    => $projectHeaders,
-            'classSectionId'    => $classSectionId,
-            'scoresLocked'      => $scoresLocked,
-        ]);
-    }
-
-    public function updateProject()
-    {
-        $studentModel = new StudentModel();
-        $scores       = $this->request->getPost('scores');
-        $studentIds   = $this->request->getPost('student_ids');
-        $semester     = $this->request->getPost('semester') ?? $this->getTeacherSelectedSemester();
-        $schoolYear   = $this->request->getPost('school_year') ?? $this->getTeacherSchoolYear();
-
-        $updatedBy = $this->request->getPost('teacher_id') ?? session()->get('user_id');
-        $classSectionId = $this->request->getPost('class_section_id') ?? session()->get('class_section_id'); // already stored in showProjectMngt
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if ($scores && $studentIds && $semester && $schoolYear && $classSectionId) {
-            $this->updateProjectScores($scores, $updatedBy, $classSectionId);
-            session()->setFlashdata('status', 'Project scores updated successfully.');
-
-            // ⬇️ Directly call the method and return its view
-            return $this->showProjectMngt($updatedBy);
-        }
-
-        $studentTeacherInfo = $studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        return redirect()->back()->with('status', 'Failed to update scores.');
-    }
-
-    private function isScoresLocked(int $classSectionId, string $semester, string $schoolYear): bool
-    {
-        return $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-    }
-
-    /**____________________helpers________________________ */
-
-    private function saveProjectScores(array $scores, array $studentIds, string $semester, string $schoolYear, int $updatedBy, int $classSectionId)
-    {
-        $projectModel = new \App\Models\ProjectModel();
-        $now = utc_now();
-
-        foreach ($studentIds as $studentId) {
-            if (!isset($scores[$studentId])) {
-                continue;
-            }
-
-            foreach ($scores[$studentId] as $index => $score) {
-                // Check if the record exists
-                $existing = $projectModel
-                    ->where('student_id', $studentId)
-                    ->where('project_index', $index)
-                    ->where('semester', $semester)
-                    ->where('school_year', $schoolYear)
-                    ->where('class_section_id', $classSectionId)
-                    ->where('updated_by', $updatedBy)
-                    ->first();
-
-                $data = [
-                    'student_id'       => $studentId,
-                    'class_section_id' => $classSectionId,
-                    'updated_by'       => $updatedBy,
-                    'project_index'   => $index,
-                    'score'            => is_numeric($score) ? floatval($score) : null,
-                    'semester'         => $semester,
-                    'school_year'      => $schoolYear,
-                    'updated_at'       => $now,
-                ];
-
-                if ($existing && isset($existing['id'])) {
-                    $projectModel->update($existing['id'], $data);
-                } else {
-                    $data['created_at'] = $now;
-                    $data['school_id'] = ''; // Set if needed
-                    $projectModel->insert($data);
-                }
-            }
-        }
-    }
-
-    private function getProjectHeaders($classSectionId, $semester, $schoolYear)
-    {
-        $projectModel = new ProjectModel();
-        $rows = $projectModel
-            ->select('project_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->orderBy('project_index', 'ASC')
-            ->findAll();
-
-        $headers = [];
-
-        foreach ($rows as $row) {
-            $index = $row['project_index'];
-            if (!is_array($index)) {
-                $headers[$index] = true;
-            }
-        }
-
-        ksort($headers);
-        return array_keys($headers);
-    }
-    private function getStudentsByClassSectionAndYear($classSectionId, $schoolYear)
-    {
-        $studentClassModel = new \App\Models\StudentClassModel();
-        $studentModel      = new \App\Models\StudentModel();
-
-        // Step 1: Get student IDs from student_class table
-        $studentClassRows = $studentClassModel
-            ->select('student_id')
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $studentIds = array_column($studentClassRows, 'student_id');
-
-        if (empty($studentIds)) {
-            return []; // No students found
-        }
-
-        // Step 2: Get student data from students table
-        $students = $studentModel
-            ->whereIn('id', $studentIds)
-            ->where('is_active', 1)
-            ->orderBy('lastname', 'ASC')
-            ->findAll();
-
-        return $students;
-    }
-
-    private function getClassSectionIdForTeacher($updatedBy)
-    {
-        $teacherClassModel = new TeacherClassModel();
-        $class = $teacherClassModel->where('teacher_id', $updatedBy)->first();
-        return $class['class_section_id'] ?? null;
-    }
-
-    private function getProjectScoresByStudent($classSectionId, $semester, $schoolYear)
-    {
-        $projectModel = new ProjectModel();
-
-        $rows = $projectModel
-            ->select('student_id, project_index, score')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $studentScores = [];
-        foreach ($rows as $row) {
-            $studentId = $row['student_id'];
-            $index = $row['project_index'];
-            $score = $row['score'];
-
-            $studentScores[$studentId]['scores'][$index] = $score;
-        }
-
-        return $studentScores;
-    }
-
-    private function getStudentsWithProjectScores($classSectionId, $projectHeaders)
-    {
-        $studentClassModel = new StudentClassModel();
-        $studentModel = new StudentModel();
-        $projectModel = new ProjectModel();
-
-        $studentClasses = $studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
-        $students = [];
-
-        foreach ($studentClasses as $sc) {
-            $student = $studentModel
-                ->where('id', $sc['student_id'])
-                ->where('is_active', 1)
-                ->first();
-            if (!$student) continue;
-
-            $scores = [];
-            foreach ($projectHeaders as $index => $ids) {
-                $entry = $projectModel->where('project_index', $index)
-                    ->where('student_id', $sc['student_id'])
-                    ->first();
-                $scores[$index] = $entry['score'] ?? '';
-            }
-
-            $students[] = [
-                'student_id' => $sc['student_id'],
-                'firstname'  => $student['firstname'],
-                'lastname'   => $student['lastname'],
-                'scores'     => $scores
-            ];
-        }
-
-        usort($students, fn($a, $b) => strcmp($a['lastname'], $b['lastname']) ?: strcmp($a['firstname'], $b['firstname']));
-        return $students;
-    }
-
-    private function getTeacherSelectedSemester(): string
-    {
-        helper('semester_selection_helper');
-        return selected_teacher_semester();
-    }
-
-    private function getTeacherSchoolYear(): string
-    {
-        return (string) $this->schoolYear;
-    }
-}
diff --git a/app/Http/Controllers/old/QuizController.php b/app/Http/Controllers/old/QuizController.php
deleted file mode 100644
index 88923eb7..00000000
--- a/app/Http/Controllers/old/QuizController.php
+++ /dev/null
@@ -1,577 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\StudentClassModel;
-use App\Models\StudentModel;
-use App\Models\QuizModel;
-use App\Models\HomeworkModel;
-use App\Models\UserModel;
-use App\Models\ConfigurationModel;
-use App\Controllers\View\GradingController;
-use RuntimeException;
-use App\Services\SemesterScoreService;
-use Config\Services;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-class QuizController extends Controller
-{
-    protected $db;
-    protected $semesterScoreService;
-    protected $quizModel;
-    protected $configModel;
-    protected $homeworkModel;
-    protected $userModel;
-    protected $schoolYear;
-    protected $semester;
-    protected $studentClassModel;
-    protected $studentModel;
-    protected $teacherClassModel;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-        $this->db = \Config\Database::connect();
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->homeworkModel = new HomeworkModel();
-        $this->userModel = new UserModel();
-        $this->studentClassModel = new StudentClassModel();
-        $this->studentModel      = new StudentModel();
-        $this->configModel = new ConfigurationModel();
-        $this->quizModel         = new QuizModel();
-        $this->semesterScoreService = service('semesterScoreService');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-    }
-
-    public function updateQuizScores(array $scores = null, int $updatedBy = null, int $classSectionId = null)
-    {
-        $scores = $this->request->getPost('scores');
-        log_message('error', '✅ Raw Scores: ' . print_r($scores, true));
-
-        if ($updatedBy === null) {
-            $updatedBy = session()->get('user_id');
-        }
-        $classSectionId = $this->request->getPost('class_section_id') ?? session()->get('class_section_id');
-        $semester = $this->request->getPost('semester') ?? $this->getTeacherSelectedSemester();
-        $schoolYear = $this->request->getPost('school_year') ?? $this->schoolYear;
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-        $studentIds = is_array($scores) ? array_keys($scores) : array_keys((array) $missingOk);
-        $indexSet = [];
-        if (is_array($scores)) {
-            foreach ($scores as $studentId => $quizData) {
-                if (!is_array($quizData)) {
-                    continue;
-                }
-                foreach ($quizData as $index => $score) {
-                    if (is_numeric($index)) {
-                        $indexSet[(int)$index] = true;
-                    }
-                }
-            }
-        }
-        $checkedItems = [];
-        if (is_array($missingOk)) {
-            foreach ($missingOk as $studentId => $indexes) {
-                if (!is_array($indexes)) {
-                    continue;
-                }
-                foreach ($indexes as $index => $flag) {
-                    if (!is_numeric($index)) {
-                        continue;
-                    }
-                    $checkedItems[] = [
-                        'student_id' => (int) $studentId,
-                        'item_index' => (int) $index,
-                    ];
-                }
-            }
-        }
-        $this->missingScoreOverrideModel->replaceOverrides(
-            $classSectionId,
-            (string) $semester,
-            (string) $schoolYear,
-            'quiz',
-            $studentIds,
-            array_keys($indexSet),
-            $checkedItems,
-            $updatedBy
-        );
-
-        if (is_array($scores)) {
-            foreach ($scores as $studentId => $quizData) {
-                if (!is_numeric($studentId) || $studentId <= 0) continue;
-
-                // Normalize: if single input submitted
-                if (!is_array($quizData)) {
-                    $quizData = [1 => $quizData];
-                }
-
-                foreach ($quizData as $quizNumber => $score) {
-                    if (!is_numeric($quizNumber)) continue;
-
-                    $isBlank = $score === null || (is_string($score) && trim($score) === '');
-                    $normalizedScore = (!$isBlank && is_numeric($score)) ? (float) $score : null;
-
-                    $existing = $this->quizModel->where([
-                        'student_id'       => $studentId,
-                        'quiz_index'      => $quizNumber,
-                        'class_section_id' => $classSectionId,
-                        'semester'         => $semester,
-                        'school_year'      => $schoolYear,
-                    ])->first();
-
-                    if ($isBlank) {
-                        if ($existing) {
-                            $this->quizModel->update($existing['id'], [
-                                'score'      => null,
-                                'updated_at' => utc_now(),
-                            ]);
-                        } else {
-                            $this->quizModel->insert([
-                                'student_id'       => $studentId,
-                                'school_id'        => '', // Optional
-                                'class_section_id' => $classSectionId,
-                                'updated_by'       => $updatedBy,
-                                'quiz_index'      => $quizNumber,
-                                'score'            => null,
-                                'semester'         => $semester,
-                                'school_year'      => $schoolYear,
-                                'created_at'       => utc_now(),
-                                'updated_at'       => utc_now()
-                            ]);
-                        }
-                        continue;
-                    }
-
-                    if ($existing) {
-                        $this->quizModel->update($existing['id'], [
-                            'score'      => $normalizedScore,
-                            'updated_at' => utc_now()
-                        ]);
-                        log_message('debug', "✅ Updated quiz ID {$existing['id']} with score {$normalizedScore}");
-                    } else {
-                        $this->quizModel->insert([
-                            'student_id'       => $studentId,
-                            'school_id'        => '', // Optional
-                            'class_section_id' => $classSectionId,
-                            'updated_by'       => $updatedBy,
-                            'quiz_index'      => $quizNumber,
-                            'score'            => $normalizedScore,
-                        'semester'         => $semester,
-                        'school_year'      => $schoolYear,
-                            'created_at'       => utc_now(),
-                            'updated_at'       => utc_now()
-                        ]);
-                        log_message('debug', "✅ Inserted quiz for student $studentId quiz $quizNumber with score $score");
-                    }
-                }
-            }
-        }
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        return redirect()->to(base_url('/teacher/addQuiz'))->with('status', 'Quiz scores updated successfully.');
-    }
-
-    public function addQuiz()
-    {
-        // 1) class_section_id from view (POST/GET) with session fallback
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $classSectionId = (int) ($incoming ?: 0);
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-        session()->set('class_section_id', $classSectionId);
-
-        // 3) Headers: distinct quiz_index for this class/term
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->schoolYear;
-        $quizHeaderRows = $this->quizModel->select('quiz_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->where('semester', $semester)
-            ->groupBy('quiz_index')
-            ->orderBy('quiz_index', 'ASC')
-            ->get()->getResultArray();
-
-        $quizHeaders = array_map(static fn($r) => (int)$r['quiz_index'], $quizHeaderRows); // [1,2,3,...]
-
-        // 4) Roster (distinct students for this section/term)
-        $roster = $this->db->table('student_class sc')
-            ->select('s.id AS student_id, s.firstname, s.lastname, s.school_id')
-            ->distinct() // ✅ apply DISTINCT correctly
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->where('sc.class_section_id', $classSectionId)
-            ->where('sc.school_year', $schoolYear)
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()->getResultArray();
-
-
-        // 5) All existing quiz scores (single query) -> pivot
-        $scoreRows = $this->quizModel->select('id, student_id, quiz_index, score')
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->where('semester', $semester)
-            ->get()->getResultArray();
-
-        $scoresMap = []; // [student_id][quiz_index] => score
-        $idMap     = []; // [student_id][quiz_index] => id (if you need to update existing rows)
-
-        foreach ($scoreRows as $r) {
-            $sid = (int)$r['student_id'];
-            $qi  = (int)$r['quiz_index'];
-            $scoresMap[$sid][$qi] = $r['score'];
-            $idMap[$sid][$qi]     = (int)$r['id'];
-        }
-
-        // 6) Build students array with per-quiz scores
-        $students = [];
-        foreach ($roster as $st) {
-            $sid = (int)$st['student_id'];
-
-            $quizScores = [];
-            foreach ($quizHeaders as $qi) {
-                $quizScores[$qi] = $scoresMap[$sid][$qi] ?? ''; // empty if none yet
-            }
-
-            $students[] = [
-                'student_id' => $sid,
-                'firstname'  => $st['firstname'],
-                'lastname'   => $st['lastname'],
-                'school_id'  => $st['school_id'] ?? null,
-                'scores'     => $quizScores,
-                // If your view needs existing row ids to decide update vs insert:
-                'existingIds' => $idMap[$sid] ?? [], // optional
-            ];
-        }
-
-        // 7) Render
-        return view('teacher/add_quiz', [
-            'students'       => $students,
-            'quizHeaders'    => $quizHeaders,  // e.g., [1,2,3]
-            'semester'       => $semester,
-            'schoolYear'     => $this->schoolYear,
-            'classSectionId' => $classSectionId,
-            'missingOkMap'   => $this->missingScoreOverrideModel->getOverridesMap($classSectionId, $semester, $this->schoolYear, 'quiz'),
-        ]);
-    }
-
-
-    public function addNextQuizColumn()
-    {
-        $updatedBy = session()->get('user_id');
-        $classSectionId = session()->get('class_section_id');
-
-        if (!$updatedBy || !$classSectionId) {
-            return $this->response->setJSON([
-                'status'  => 'error',
-                'message' => 'Missing teacher or class section data.'
-            ]);
-        }
-
-        try {
-
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->schoolYear;
-        $existingQuizNumbers = $this->quizModel
-            ->select('quiz_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-                ->groupBy('quiz_index')
-                ->orderBy('quiz_index', 'DESC')
-                ->findAll();
-
-            $maxQuizNumber = 0;
-            foreach ($existingQuizNumbers as $row) {
-                if (is_numeric($row['quiz_index'])) {
-                    $maxQuizNumber = max($maxQuizNumber, (int)$row['quiz_index']);
-                }
-            }
-
-            $nextQuizNumber = $maxQuizNumber + 1;
-
-            if ($nextQuizNumber <= 0) {
-                return $this->response->setJSON([
-                    'status'     => 'error',
-                    'message'    => '🚫 Invalid quiz number',
-                    'calculated' => $nextQuizNumber
-                ]);
-            }
-
-            $students = $this->studentClassModel
-                ->where('class_section_id', $classSectionId)
-                ->findAll();
-
-            if (empty($students)) {
-                return $this->response->setJSON([
-                    'status'  => 'error',
-                    'message' => 'No students found in this class section.'
-                ]);
-            }
-
-            $firstInsertedId = null;
-
-            foreach ($students as $i => $student) {
-                $exists = $this->quizModel
-                    ->where([
-                        'student_id'       => $student['student_id'],
-                        'quiz_index'      => $nextQuizNumber,
-                        'class_section_id' => $classSectionId,
-                        'updated_by'       => $updatedBy,
-                        'semester'         => $this->semester,
-                        'school_year'      => $this->schoolYear,
-                    ])
-                    ->first();
-
-                if ($exists) continue;
-
-                $insertData = [
-                    'student_id'       => $student['student_id'],
-                    'class_section_id' => $classSectionId,
-                    'updated_by'       => $updatedBy,
-                    'quiz_index'      => $nextQuizNumber,
-                    'score'            => null,
-                    'semester'         => $semester,
-                    'school_year'      => $schoolYear,
-                    'created_at'       => utc_now(),
-                    'updated_at'       => utc_now(),
-                ];
-
-                log_message('error', '✅ Inserting quiz row: ' . json_encode($insertData));
-
-                try {
-                    $id = $this->quizModel->insert($insertData, true);
-                    if ($i === 0) $firstInsertedId = $id;
-                } catch (\Throwable $e) {
-                    return $this->response->setJSON([
-                        'status'  => 'error',
-                        'message' => '❌ Insert failed: ' . $e->getMessage(),
-                        'debug'   => $insertData
-                    ]);
-                }
-            }
-
-            return $this->response->setJSON([
-                'status'        => 'success',
-                'quiz_index'   => $nextQuizNumber,
-                'new_quiz_id'   => $firstInsertedId
-            ]);
-        } catch (\Throwable $e) {
-            return $this->response->setJSON([
-                'status'  => 'error',
-                'message' => '❌ Unexpected error: ' . $e->getMessage()
-            ]);
-        }
-    }
-
-    public function showQuizMngt()
-    {
-        // Accept POST first, then GET (query string), then session fallback
-        $incomingId = $this->request->getPost('class_section_id');
-        if (!$incomingId) {
-            $incomingId = $this->request->getGet('class_section_id');
-        }
-
-        $classSectionId = (int) ($incomingId ?: (session()->get('class_section_id') ?? 0));
-
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('status', 'No class section found for the current teacher or selection.');
-        }
-        session()->set('class_section_id', $classSectionId);
-        $semester = $this->getTeacherSelectedSemester();
-        $schoolYear = $this->schoolYear;
-        $quizScores = $this->getquizScoresByStudent($classSectionId, $semester, $schoolYear);
-        $students = $this->getStudentsByClassSectionAndYear($classSectionId, $schoolYear);
-        $quizHeaders = $this->getquizHeaders($classSectionId, $semester, $schoolYear);
-        $scoresLocked = $this->isScoresLocked($classSectionId, $semester, $schoolYear);
-
-        return view('grading/quiz', [
-            'quizScores'    => $quizScores,
-            'students'          => $students,
-            'semester'          => $semester,
-            'schoolYear'        => $schoolYear,
-            'quizHeaders'   => $quizHeaders,
-            'classSectionId' => $classSectionId,
-            'scoresLocked'   => $scoresLocked,
-        ]);
-    }
-
-    public function updateQuiz()
-    {
-        $scores       = $this->request->getPost('scores');
-        $studentIds   = $this->request->getPost('student_ids');
-        $semester     = $this->request->getPost('semester') ?? $this->getTeacherSelectedSemester();
-        $schoolYear   = $this->request->getPost('school_year') ?? $this->schoolYear;
-
-        $updatedBy = $this->request->getPost('teacher_id') ?? session()->get('user_id');
-        $classSectionId = $this->request->getPost('class_section_id') ?? session()->get('class_section_id'); // or query it
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->isScoresLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if ($scores && $studentIds && $semester && $schoolYear && $classSectionId) {
-            $this->updateQuizScores($scores, $updatedBy, $classSectionId);
-            session()->setFlashdata('status', 'quiz scores updated successfully.');
-
-            // ⬇️ Directly call the method and return its view
-            return $this->showQuizMngt();
-        }
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear);
-        // Call the updateScoresForStudents method
-        try {
-
-            $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
-        } catch (RuntimeException $e) {
-            // Handle error
-        }
-        return redirect()->back()->with('status', 'Failed to update scores.');
-    }
-
-    private function isScoresLocked(int $classSectionId, string $semester, string $schoolYear): bool
-    {
-        return $this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear);
-    }
-
-    private function getStudentsByClassSectionAndYear($classSectionId, $schoolYear)
-    {
-        // Step 1: Get student IDs from student_class table
-        $studentClassRows = $this->studentClassModel
-            ->select('student_id')
-            ->where('class_section_id', $classSectionId)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $studentIds = array_column($studentClassRows, 'student_id');
-
-        if (empty($studentIds)) {
-            return []; // No students found
-        }
-
-        // Step 2: Get student data from students table
-        $students = $this->studentModel
-            ->whereIn('id', $studentIds)
-            ->where('is_active', 1)
-            ->orderBy('lastname', 'ASC')
-            ->findAll();
-
-        return $students;
-    }
-
-    private function getquizHeaders($classSectionId, $semester, $schoolYear)
-    {
-        $rows = $this->quizModel
-            ->select('quiz_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->orderBy('quiz_index', 'ASC')
-            ->findAll();
-
-        $headers = [];
-
-        foreach ($rows as $row) {
-            $index = $row['quiz_index'];
-            if (!is_array($index)) {
-                $headers[$index] = true;
-            }
-        }
-
-        ksort($headers);
-        return array_keys($headers);
-    }
-
-    private function getClassSectionIdForTeacher($updatedBy)
-    {
-        $teacherClassModel = new TeacherClassModel();
-        $class = $teacherClassModel->where('teacher_id', $updatedBy)->first();
-        return $class['class_section_id'] ?? null;
-    }
-
-
-    private function getquizScoresByStudent($classSectionId, $semester, $schoolYear)
-    {
-        $rows = $this->quizModel
-            ->select('student_id, quiz_index, score')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $studentScores = [];
-        foreach ($rows as $row) {
-            $studentId = $row['student_id'];
-            $index = $row['quiz_index'];
-            $score = $row['score'];
-
-            $studentScores[$studentId]['scores'][$index] = $score;
-        }
-
-        return $studentScores;
-    }
-
-    private function getStudentsWithquizScores($classSectionId, $quizHeaders)
-    {
-        $studentClasses = $this->studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
-        $students = [];
-
-        foreach ($studentClasses as $sc) {
-            $student = $this->studentModel
-                ->where('id', $sc['student_id'])
-                ->where('is_active', 1)
-                ->first();
-            if (!$student) continue;
-
-            $scores = [];
-            foreach ($quizHeaders as $index => $ids) {
-                $entry = $this->quizModel->where('quiz_index', $ids)
-                    ->where('student_id', $sc['student_id'])
-                    ->first();
-                $scores[$index] = $entry['score'] ?? '';
-            }
-
-            $students[] = [
-                'student_id' => $sc['student_id'],
-                'firstname'  => $student['firstname'],
-                'lastname'   => $student['lastname'],
-                'scores'     => $scores
-            ];
-        }
-
-        usort($students, fn($a, $b) => strcmp($a['lastname'], $b['lastname']) ?: strcmp($a['firstname'], $b['firstname']));
-        return $students;
-    }
-
-    private function getTeacherSelectedSemester(): string
-    {
-        helper('semester_selection_helper');
-        return selected_teacher_semester();
-    }
-}
diff --git a/app/Http/Controllers/old/RegisterController.php b/app/Http/Controllers/old/RegisterController.php
deleted file mode 100644
index fe223449..00000000
--- a/app/Http/Controllers/old/RegisterController.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use CodeIgniter\Controller;
-use App\Models\ConfigurationModel;
-use App\Models\UserModel;
-use App\Models\AuthorizedUserModel;
-use App\Models\RoleModel;
-use App\Models\ParentModel;
-use App\Models\UserRoleModel;
-use App\Services\EmailService;
-use App\Services\SchoolIdService;
-use App\Services\PhoneFormatterService;
-
-class RegisterController extends Controller
-{
-    protected $db;
-    protected $configModel;
-    protected $semester;
-    protected $schoolYear;
-    protected $userRoleModel;
-    protected $roleModel;
-    protected $userModel;
-    protected $parentModel;
-
-    public function __construct()
-    {
-        // Load the database service
-        $this->db = \Config\Database::connect();
-        // Check if the database connection is established
-        if (!$this->db->connect()) {
-            log_message('error', 'Database connection failed.');
-            throw new \Exception('Database connection failed.');
-        } else {
-            log_message('info', 'Database connection successful.');
-        }
-        $this->configModel = new ConfigurationModel(); 
-        $this->userRoleModel = new UserRoleModel();
-        $this->roleModel = new RoleModel();
-        $this->userModel = new UserModel();
-        $this->parentModel = new ParentModel();
-
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-    }
-        
-    public function index()
-    {
-        log_message('debug', 'CAPTCHA session value: ' . session()->get('captcha_answer'));
-
-        // Only generate CAPTCHA if not already set (first visit or after submission)
-        if (!session()->has('captcha_answer')) {
-            $length = rand(4, 8);
-            $captchaText = $this->generateCaptchaText($length);
-            session()->set('captcha_answer', $captchaText);
-        }
-
-        $data['captchaQuestion'] = session()->get('captcha_answer');
-
-        // ✅ NO need to check policy_accepted here
-        return view('user/register', $data);
-    }
-
-    private function generateCaptchaText($length)
-    {
-        $characters = 'ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghjkmnopqrstuvwxyz0123456789';
-        $captchaText = '';
-
-        for ($i = 0; $i < $length; $i++) {
-            $captchaText .= $characters[rand(0, strlen($characters) - 1)];
-        }
-
-        return $captchaText;
-    }
-
-    public function success()
-    {
-        // Start session
-        $session = session();
-
-        // Check if the session has 'user_email'
-        if (!$session->has('user_email')) {
-            // If not, redirect to the registration page
-            return redirect()->to('/register');
-        }
-
-        // Get 'user_email' from session
-        $email = $session->get('user_email');
-
-        // Pass the 'email' variable to the success view
-        return view('success', ['email' => $email]);
-    }
-
-
-    public function register()
-    {
-        helper(['url', 'form']);
-        log_message('debug', 'CAPTCHA session value: ' . session()->get('captcha_answer'));
-
-        /* ───────────── 1.  Load services ───────────── */  
-        $schoolIdService = new SchoolIdService();
-
-        /* ───────────── 2.  Sanitize & raw data ───────────── */
-        $post    = $this->formatUserInput($this->request); // safe / formatted
-        $rawPost = $this->request->getPost();              // raw (for flags etc.)
-        $captcha = $rawPost['captcha'] ?? '';
-
-        /* ───────────── 3.  Validation rules ───────────── */
-        $rules = [
-            'firstname'  => 'required|regex_match[/^[a-zA-Z\s-]+$/]|min_length[2]|max_length[30]',
-            'lastname'   => 'required|regex_match[/^[a-zA-Z\s-]+$/]|min_length[2]|max_length[30]',
-            'gender'     => 'required|in_list[Male,Female]',
-            'email'      => 'required|valid_email|max_length[50]',
-            'confirm_email' => 'required|matches[email]',
-            'cellphone'  => 'required|regex_match[/^[\d\s\-\(\)\.]+$/]|min_length[10]|max_length[20]',
-            'address_street' => 'permit_empty|regex_match[/^[a-zA-Z0-9\s\-]+$/]|max_length[150]',
-            'apt'        => 'permit_empty|regex_match[/^[a-zA-Z0-9\s-]+$/]|max_length[10]',
-            'city'       => 'required|alpha_space|min_length[2]|max_length[30]',
-            'state'      => 'required|in_list[CT,ME,MA,NH,NY,RI,VT]',
-            'zip'        => 'required|regex_match[/^\d{5}$/]',
-            'accept_school_policy' => 'required',
-            'captcha'    => 'required|alpha_numeric|min_length[4]|max_length[10]',
-        ];
-
-        // 1. Check if "I am a parent" checkbox is ticked
-        $isParent = isset($rawPost['is_parent']) && $rawPost['is_parent'] == '1';
-
-        // 2. If parent, handle second parent logic
-        if ($isParent) {
-            $noSecondParent = isset($rawPost['no_second_parent_info']) && $rawPost['no_second_parent_info'] == '1';
-
-            $secondParentProvided = !empty($rawPost['second_firstname']) ||
-                                    !empty($rawPost['second_lastname']) ||
-                                    !empty($rawPost['second_gender']) ||
-                                    !empty($rawPost['second_email']) ||
-                                    !empty($rawPost['second_cellphone']);
-
-            // 3. Error: must provide second parent or check "no second parent"
-            if (!$noSecondParent && !$secondParentProvided) {
-                return redirect()->back()->withInput()->with('errors', [
-                    'second_parent_info' => 'As a parent, please provide second parent information or check "No second parent info".'
-                ]);
-            }
-
-            // 4. Add second parent field rules only if "no second parent" is NOT checked
-            if (!$noSecondParent) {
-                $rules += [
-                    'second_firstname' => 'required|regex_match[/^[a-zA-Z\s\-]+$/]|min_length[2]|max_length[30]',
-                    'second_lastname'  => 'required|regex_match[/^[a-zA-Z\s\-]+$/]|min_length[2]|max_length[30]',
-                    'second_gender'    => 'required|in_list[Male,Female]',
-                    'second_email'     => 'required|valid_email|max_length[50]',
-                    'second_cellphone' => 'required|regex_match[/^[\d\s\-\(\)\.]+$/]|min_length[10]|max_length[20]',
-                ];
-            }
-        }
-
-        log_message('debug', '🧪 Starting validation check...');
-        if (!$this->validate($rules)) {
-            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
-        }
-
-        /* ───────────── 4.  CAPTCHA check ───────────── */
-        if ($captcha !== session()->get('captcha_answer')) {
-            return redirect()->back()
-                ->withInput()
-                ->with('errors', ['captcha' => '']) // keeps input marked as invalid
-                ->with('top_error', 'Incorrect CAPTCHA answer. Please try again.');
-        }
-
-        /* ───────────── 5.  Unique e-mail ───────────── */
-        // Step 1: Check if a user with this email exists
-        $existingUser = $this->userModel->where('email', $post['email'])->first();
-
-        if ($existingUser) {
-            // Step 2: Check if the user has a token (i.e., not verified yet)
-            if (!empty($existingUser['token']) && $existingUser['is_verified'] == 0) {
-                // User exists and is unverified
-                return redirect()->back()->withInput()->with('error',
-                    'This email address is already registered and is pending activation. Please check your email to activate your account.');
-            } else {
-                // User exists and is already active or has no token
-                return redirect()->back()->withInput()->with('error',
-                    'The email address you entered is already in use. Please try a different one.');
-            }
-        }
-
-        /* ───────────── 6.  Determine role ───────────── */
-        $roleName = !empty($rawPost['is_parent']) ? 'parent' : 'guest';
-        $role     = $this->roleModel->where('name', $roleName)->first();
-        if (!$role) {
-            return redirect()->back()->withInput()->with('errors', ['role' => 'Role not found']);
-        }
-
-        /* ───────────── 7.  Build & insert user ───────────── */
-        $token    = bin2hex(random_bytes(48));
-        $userData = [
-            'firstname'  => $post['firstname'],
-            'lastname'   => $post['lastname'],
-            'gender'     => $post['gender'],
-            'email'      => $post['email'],
-            'cellphone'  => $post['cellphone'],
-            'address_street' => $post['address_street'] ?? null,
-            'apt'        => $post['apt'] ?? null,
-            'city'       => $post['city'],
-            'state'      => $post['state'],
-            'zip'        => $post['zip'],
-            'token'      => $token,
-            'is_verified'=> 0,
-            'accept_school_policy' => (int) $post['accept_school_policy'],
-            'status'     => 'Inactive',
-            'school_id'  => $schoolIdService->generateUserSchoolId(),
-            'semester'   => $this->semester,
-            'school_year'=> $this->schoolYear,
-        ];
-
-        $this->db->transStart();
-
-        if (!$this->userModel->insert($userData)) {
-            $this->db->transRollback();
-            return redirect()->back()->withInput()->with('errors', $this->userModel->errors());
-        }
-        $firstParentId = $this->userModel->getInsertID();
-
-        $this->userRoleModel->insert([
-            'user_id'    => $firstParentId,
-            'role_id'    => $role['id'],
-            'created_at' => utc_now(),
-        ]);
-
-        /* ───────────── 8.  Optional second-parent insert ───────────── */
-        if ($isParent) {
-            if (empty($rawPost['no_second_parent_info'])) {
-                $this->parentModel->insert([
-                    'secondparent_firstname' => $post['second_firstname'],
-                    'secondparent_lastname'  => $post['second_lastname'],
-                    'secondparent_gender'    => $post['second_gender'],
-                    'secondparent_email'     => $post['second_email'],
-                    'secondparent_phone'     => $post['second_cellphone'],
-                    'firstparent_id'         => $firstParentId,
-                    'semester'               => $this->semester,
-                    'school_year'            => $this->schoolYear,
-                ]);
-            }
-        }
-
-        $this->db->transComplete();
-        if (!$this->db->transStatus()) {
-            return redirect()->back()->withInput()->with('error', 'Registration failed, please try again.');
-        }
-
-        /* ───────────── 9.  Confirmation e-mail ───────────── */
-        $recipientName   = $post['firstname'] . ' ' . $post['lastname'];
-        $activationLink  = site_url('/user/confirm/' . $token);
-        $orgName         = 'Al Rahma Sunday School';
-        $contactInfo     = 'alrahma.isgl@gmail.com';
-        $logoUrl         = 'https://alrahmaisgl.org/assets/images/alrahma_logo.png';
-
-        $emailData = [
-            'recipientName'  => $recipientName,
-            'activationLink' => $activationLink,
-            'orgName'        => $orgName,
-            'contactInfo'    => $contactInfo,
-            'logoUrl'        => $logoUrl,
-            'subject'        => 'Email Confirmation'
-        ];
-
-        if ($isParent) {
-            $html = view('emails/welcome_parent', $emailData);
-        } else {
-            $html = view('emails/welcome_staff', $emailData);
-        }
-
-        (new EmailService())->send($post['email'], 'Email Confirmation', $html, 'general');
-
-
-        /* ───────────── 10.  Redirect to success ───────────── */
-        session()->set('user_email', $post['email']);
-        session()->remove('captcha_answer'); // Clear CAPTCHA after success
-        return redirect()->to('/register/success');
-    }
-
-    private function formatName(string $name): string
-    {
-        $name = trim($name);
-        return ucwords(strtolower($name), " -");
-    }
-
-    private function formatEmail(?string $email): string
-    {
-        $email = strtolower(trim($email));
-/*
-        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-            throw new \InvalidArgumentException('Please enter a valid email address.');
-        }*/
-        return $email;
-    }
-
-    private function formatAddress(string $address): string
-    {
-        return ucwords(strtolower(trim($address)));
-    }
-
-    private function formatUserInput($request): array
-{
-    $formatter = new PhoneFormatterService();
-    $post = (array) $request->getPost();
-
-    // tiny helper: safe getter + trim + cast to string
-    $g = static function (string $key) use ($post): string {
-        return trim((string) ($post[$key] ?? ''));
-    };
-
-    $data = [
-        'firstname'            => $this->formatName($g('firstname')),
-        'lastname'             => $this->formatName($g('lastname')),
-        'email'                => $this->formatEmail($g('email')),
-        'gender'               => $g('gender'),
-        'city'                 => $this->formatName($g('city')),
-        'cellphone'            => $formatter->formatPhoneNumber($g('cellphone')),   // ✅ safe
-        'address_street'       => $this->formatAddress($g('address_street')),
-        'apt'                  => strtoupper($g('apt')),
-        'state'                => strtoupper($g('state')),
-        'zip'                  => $g('zip'),
-        'accept_school_policy' => (int) ($post['accept_school_policy'] ?? 0),
-    ];
-
-    // if user says "no second parent info", skip entirely
-    $noSecondInfo = !empty($post['no_second_parent_info']);
-
-    // collect (safely) and see if anything was provided
-    $second_firstname = $this->formatName($g('second_firstname'));
-    $second_lastname  = $this->formatName($g('second_lastname'));
-    $second_gender    = $g('second_gender');
-    $second_email     = $this->formatEmail($g('second_email'));
-    $second_cellphone = $formatter->formatPhoneNumber($g('second_cellphone'));      // ✅ safe
-
-    $secondProvided = !$noSecondInfo && (
-        $second_firstname !== '' ||
-        $second_lastname  !== '' ||
-        $second_gender    !== '' ||
-        $second_email     !== '' ||
-        preg_replace('/\D/', '', $second_cellphone) !== ''
-    );
-
-    if ($secondProvided) {
-        $data['second_firstname'] = $second_firstname;
-        $data['second_lastname']  = $second_lastname;
-        $data['second_gender']    = $second_gender;
-        $data['second_email']     = $second_email;
-        $data['second_cellphone'] = $second_cellphone;
-    }
-
-    return $data;
-}
-
-
-
-
-}
\ No newline at end of file
diff --git a/app/Http/Controllers/old/RoleService.php b/app/Http/Controllers/old/RoleService.php
new file mode 100644
index 00000000..f496ec53
--- /dev/null
+++ b/app/Http/Controllers/old/RoleService.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\RoleModel;
+
+class RoleService
+{
+    public function __construct(private RoleModel $roles = new RoleModel()) {}
+
+    /** @param string[] $roleKeys names or slugs */
+    public function bestDashboardRouteFor(array $roleKeys): string
+    {
+        $rows = $this->roles->findByNamesOrSlugs($roleKeys);
+        if (!empty($rows)) {
+            // first row is highest priority due to orderBy('priority','ASC')
+            return $rows[0]['dashboard_route'] ?? '/landing_page/guest_dashboard';
+        }
+        return '/landing_page/guest_dashboard';
+    }
+}
diff --git a/app/Http/Controllers/old/SchoolIdService.php b/app/Http/Controllers/old/SchoolIdService.php
new file mode 100644
index 00000000..84876f7d
--- /dev/null
+++ b/app/Http/Controllers/old/SchoolIdService.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\UserModel;
+use CodeIgniter\Database\BaseConnection;
+
+class SchoolIdService
+{
+    protected $db;
+    protected $userModel;
+
+    public function __construct()
+    {
+        $this->db = \Config\Database::connect();
+        $this->userModel = new UserModel();
+    }
+
+    public function assignSchoolIdToUser($userId)
+    {
+        $user = $this->userModel->find($userId);
+        if (!$user || $user['school_id']) {
+            return $user['school_id'] ?? null;
+        }
+
+        $schoolId = $this->generateUserSchoolId();
+
+        $this->userModel->update($userId, ['school_id' => $schoolId]);
+
+        return $schoolId;
+    }
+
+public function generateStudentSchoolId()
+{
+    $year = date('y');
+    $maxId = 0;
+
+    // Match the real prefix: STU + year
+    $studentMax = $this->db->table('students')
+        ->select('MAX(school_id) AS max_id')
+        ->like('school_id', "STU{$year}", 'after')
+        ->get()
+        ->getRowArray();
+
+    if (!empty($studentMax['max_id'])) {
+        // Skip "STUyy" (5 chars)
+        $numericPart = substr($studentMax['max_id'], 5);
+        $maxId = (int) $numericPart;
+    }
+
+    $nextId = str_pad($maxId + 1, 5, '0', STR_PAD_LEFT);
+    return "STU{$year}{$nextId}";
+}
+
+
+    public function generateUserSchoolId()
+    {
+        $year = date('y');
+        $maxId = 0;
+
+        // Get maximum user ID for current year
+        $userMax = $this->db->table('users')->select('MAX(school_id) AS max_id')
+            ->notLike('school_id', 'S%') // Exclude student IDs
+            ->like('school_id', $year, 'after')->get()->getRowArray();
+
+        if (!empty($userMax['max_id'])) {
+            $numericPart = substr($userMax['max_id'], 2); // Skip 2-digit year
+            $maxId = max($maxId, (int)$numericPart);
+        }
+
+        $nextId = str_pad($maxId + 1, 5, '0', STR_PAD_LEFT);
+        return "{$year}{$nextId}";
+    }
+}
diff --git a/app/Http/Controllers/old/ScoreCommentController.php b/app/Http/Controllers/old/ScoreCommentController.php
deleted file mode 100644
index 5f9d0ae1..00000000
--- a/app/Http/Controllers/old/ScoreCommentController.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Controllers\BaseController;
-use App\Models\ScoreCommentModel;
-use App\Models\ConfigurationModel;
-use App\Models\StudentModel;
-use App\Models\SemesterScoreModel;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-class ScoreCommentController extends BaseController
-{
-    protected $db;
-    protected $configModel;
-    protected $semester;
-    protected $schoolYear;
-    protected $scoreCommentModel;
-    protected $studentModel;
-    protected $semesterScoreModel;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-                // Load the database service
-        $this->db = \Config\Database::connect();
-        // Check if the database connection is established
-        if (!$this->db->connect()) {
-            log_message('error', 'Database connection failed.');
-            throw new \Exception('Database connection failed.');
-        } else {
-            log_message('info', 'Database connection successful.');
-        }
-        $this->configModel = new ConfigurationModel(); 
-        $this->scoreCommentModel = new ScoreCommentModel();
-        $this->studentModel = new StudentModel();
-        $this->semesterScoreModel = new SemesterScoreModel();
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-    }
-
-
-    public function saveComments()
-    {
-        $comments = $this->request->getPost('comments');
-        $classSectionId = (int)($this->request->getPost('class_section_id') ?? session()->get('class_section_id') ?? 0);
-        $schoolYear = (string) ($this->request->getPost('school_year') ?? $this->schoolYear);
-        $rawSelectedSemester = $this->request->getPost('selected_semester');
-        $normalizedSelected = $this->normalizeSemesterSelection($rawSelectedSemester);
-        if ($normalizedSelected !== '') {
-            $semester = ucfirst($normalizedSelected);
-        } else {
-            $semester = session()->get('teacher_scores_selected_semester')
-                ?? session()->get('semester')
-                ?? $this->semester;
-        }
-        $teacherId = session()->get('user_id');
-
-        if ($classSectionId <= 0) {
-            return redirect()->back()->with('error', 'Missing class section.');
-        }
-        if ($this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if (!is_array($comments)) {
-            return redirect()->back()->with('error', 'No comments were submitted.');
-        }
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-
-        $studentIds = array_map('intval', array_keys($comments));
-        $studentNames = $this->getStudentFirstNames($studentIds);
-
-        $isFall = strtolower((string) $semester) === 'fall';
-        $isSpring = strtolower((string) $semester) === 'spring';
-        $commentTypes = ['ptap_comment'];
-        if ($isFall) {
-            $commentTypes[] = 'midterm_comment';
-        }
-        if ($isSpring) {
-            $commentTypes[] = 'final_comment';
-        }
-        foreach ($commentTypes as $type) {
-            $checkedItems = [];
-            if (is_array($missingOk)) {
-                foreach ($missingOk as $studentId => $types) {
-                    if (!is_array($types) || empty($types[$type])) {
-                        continue;
-                    }
-                    $checkedItems[] = [
-                        'student_id' => (int) $studentId,
-                        'item_index' => null,
-                    ];
-                }
-            }
-            $this->missingScoreOverrideModel->replaceOverrides(
-                $classSectionId,
-                (string) $semester,
-                (string) $schoolYear,
-                $type,
-                $studentIds,
-                null,
-                $checkedItems,
-                $teacherId,
-                true
-            );
-        }
-
-        $errors = [];
-        $payload = [];
-
-        foreach ($comments as $studentId => $commentTypes) {
-            foreach ($commentTypes as $scoreType => $comment) {
-                $normalizedScoreType = strtolower((string)$scoreType);
-                $trimmedComment = trim((string)$comment);
-                if ($trimmedComment === '') {
-                    continue;
-                }
-
-                $validationError = $this->validateComment($trimmedComment, (int)$studentId, $normalizedScoreType, $studentNames);
-                if ($validationError !== null) {
-                    $errors[] = $validationError;
-                    log_message(
-                        'warning',
-                        "ScoreComment validation failed: teacher_id={$teacherId}, student_id={$studentId}, score_type={$normalizedScoreType}, error={$validationError}, length=" . mb_strlen($trimmedComment, 'UTF-8')
-                    );
-                    continue;
-                }
-
-                $payload[] = [
-                    'student_id' => $studentId,
-                    'class_section_id' => $classSectionId,
-                    'score_type' => $normalizedScoreType, // 'ptap', 'midterm', 'final'
-                    'semester' => $semester,
-                    'school_year' => $schoolYear,
-                    'comment' => $trimmedComment,
-                    'commented_by' => $teacherId,
-                    'created_at' => utc_now(),
-                ];
-            }
-        }
-
-        if (!empty($errors)) {
-            return redirect()->back()->with('errors', $errors)->withInput();
-        }
-
-        foreach ($payload as $data) {
-            $existing = $this->scoreCommentModel
-                ->where('student_id', $data['student_id'])
-                ->groupStart()
-                    ->where('class_section_id', $data['class_section_id'])
-                    ->orWhere('class_section_id', null)
-                ->groupEnd()
-                ->where('score_type', $data['score_type'])
-                ->where('semester', $data['semester'])
-                ->where('school_year', $data['school_year'])
-                ->first();
-
-            if ($existing) {
-                $this->scoreCommentModel->update($existing['id'], $data);
-            } else {
-                $this->scoreCommentModel->insert($data);
-            }
-        }
-
-        return redirect()->back()->with('status', 'Comments saved successfully.');
-    }
-
-
-    public function viewCommentsMngt()
-    {
-        $rawSelectedSemester = $this->request->getGet('semester')
-            ?? $this->request->getPost('semester')
-            ?? session()->get('teacher_scores_selected_semester')
-            ?? session()->get('semester')
-            ?? $this->semester;
-        $normalizedSelected = $this->normalizeSemesterSelection($rawSelectedSemester);
-        if ($normalizedSelected !== '') {
-            $activeSemester = ucfirst($normalizedSelected);
-        } else {
-            $activeSemester = $this->semester;
-        }
-
-        $incoming = $this->request->getPost('class_section_id')
-            ?? $this->request->getGet('class_section_id')
-            ?? session()->get('class_section_id');
-
-        $isAllSections = is_string($incoming) && strtolower(trim($incoming)) === 'allsections';
-        $classSectionId = $isAllSections ? null : (int) ($incoming ?: 0);
-
-        if (!$isAllSections && $classSectionId <= 0) {
-            return redirect()->back()->with('status', 'Missing class section.');
-        }
-        session()->set('class_section_id', $isAllSections ? 'allsections' : $classSectionId);
-
-        $builder = $this->db->table('student_class sc')
-            ->distinct('SELECT s.id AS student_id, s.firstname, s.lastname, s.school_id')
-            ->join('students s', 's.id = sc.student_id', 'inner')
-            ->where('sc.school_year', $this->schoolYear);
-
-        if (!$isAllSections) {
-            $builder->where('sc.class_section_id', $classSectionId);
-        }
-
-        $students = $builder
-            ->orderBy('s.lastname', 'ASC')
-            ->orderBy('s.firstname', 'ASC')
-            ->get()
-            ->getResultArray();
-
-    // 3) Load only comments for these students in this term (ptap, midterm, final)
-    $comments = [];
-    if (!empty($students)) {
-        $studentIds = array_map(static fn($r) => (int)$r['student_id'], $students);
-
-        $rawCommentsBuilder = $this->scoreCommentModel
-            ->whereIn('student_id', $studentIds)
-            ->whereIn('score_type', ['midterm', 'final', 'ptap', 'attendance'])
-            ->where('semester', $activeSemester)
-            ->where('school_year', $this->schoolYear);
-
-        if (!$isAllSections) {
-            $rawCommentsBuilder->groupStart()
-                ->where('class_section_id', $classSectionId)
-                ->orWhere('class_section_id', null); // legacy rows without class_section_id
-            $rawCommentsBuilder->groupEnd();
-        }
-
-        $rawComments = $rawCommentsBuilder->findAll();
-
-        $existingAttendance = [];
-        foreach ($rawComments as $c) {
-            $sid = (int)$c['student_id'];
-            $typ = (string)$c['score_type'];
-            $comments[$sid][$typ] = [
-                'comment'        => $c['comment'] ?? null,
-                'comment_review' => $c['comment_review'] ?? null,
-                'commented_by'   => $c['commented_by'] ?? null,
-                'reviewed_by'    => $c['reviewed_by'] ?? null,
-            ];
-            if ($typ === 'attendance') {
-                $existingAttendance[$sid] = $c;
-            }
-        }
-
-        helper('attendance_comment');
-        // Autogenerate attendance comments for display when missing
-        $attendanceScores = [];
-        $scoreRows = $this->semesterScoreModel
-            ->select(['student_id', 'attendance_score'])
-            ->whereIn('student_id', $studentIds)
-            ->where('semester', $activeSemester)
-            ->where('school_year', $this->schoolYear)
-            ->findAll();
-        foreach ($scoreRows as $row) {
-            $attendanceScores[(int)$row['student_id']] = isset($row['attendance_score'])
-                ? (float)$row['attendance_score']
-                : null;
-        }
-        $attendanceInserts = [];
-        $attendanceUpdates = [];
-        foreach ($students as $student) {
-            $sid = (int)$student['student_id'];
-            $hasComment = isset($comments[$sid]['attendance']['comment']) && trim((string)$comments[$sid]['attendance']['comment']) !== '';
-            if ($hasComment) {
-                continue;
-            }
-            $score = $attendanceScores[$sid] ?? null;
-            if ($score === null) {
-                continue;
-            }
-            $auto = attendance_comment_from_score($score, $student['firstname'] ?? '');
-            if ($auto !== null) {
-                $comments[$sid]['attendance'] = [
-                    'comment'        => $auto,
-                    'comment_review' => $comments[$sid]['attendance']['comment_review'] ?? null,
-                    'commented_by'   => $comments[$sid]['attendance']['commented_by'] ?? null,
-                    'reviewed_by'    => $comments[$sid]['attendance']['reviewed_by'] ?? null,
-                ];
-                if (isset($existingAttendance[$sid])) {
-                    $attendanceUpdates[] = [
-                        'id'           => $existingAttendance[$sid]['id'],
-                        'comment'      => $auto,
-                        'commented_by' => $existingAttendance[$sid]['commented_by'] ?? null,
-                        'class_section_id' => $classSectionId,
-                    ];
-                } else {
-                    $attendanceInserts[] = [
-                        'student_id'  => $sid,
-                        'score_type'  => 'attendance',
-                        'semester'    => $activeSemester,
-                        'school_year' => $this->schoolYear,
-                        'comment'     => $auto,
-                        'commented_by'=> null,
-                        'class_section_id' => $classSectionId,
-                        'created_at'  => utc_now(),
-                    ];
-                }
-            }
-        }
-        if (!empty($attendanceUpdates)) {
-            foreach ($attendanceUpdates as $row) {
-                $id = $row['id'];
-                unset($row['id']);
-                $this->scoreCommentModel->update($id, $row);
-            }
-        }
-        if (!empty($attendanceInserts)) {
-            $this->scoreCommentModel->insertBatch($attendanceInserts);
-        }
-    }
-
-        // 4) Render
-        return view('grading/comments', [
-            'students'       => $students,
-            'semester'       => $activeSemester,
-            'schoolYear'     => $this->schoolYear,
-            'classSectionId' => $isAllSections ? 'allsections' : $classSectionId,
-            'comments'       => $comments,
-            'scoresLocked'   => (!$isAllSections && $classSectionId > 0)
-                ? $this->gradingLockModel->isLocked($classSectionId, $activeSemester, $this->schoolYear)
-                : false,
-        ]);
-    }
-
-
-    public function updateComments()
-    {
-        $semester   = $this->request->getPost('semester');
-        $schoolYear = $this->request->getPost('school_year');
-        $teacherId  = $this->request->getPost('teacher_id') ?? session()->get('user_id');
-        $classSectionId = $this->request->getPost('class_section_id') ?? session()->get('class_section_id');
-        $comments   = $this->request->getPost('comments') ?? [];
-        $reviews    = $this->request->getPost('reviews') ?? [];
-
-        $studentIds = array_unique(array_map(
-            'intval',
-            array_merge(array_keys($comments), array_keys($reviews))
-        ));
-        $studentNames = $this->getStudentFirstNames($studentIds);
-        $isReviewer = $this->isReviewer();
-        $classSectionId = is_numeric($classSectionId) ? (int)$classSectionId : $classSectionId;
-        if (is_int($classSectionId) && $classSectionId > 0) {
-            if ($this->gradingLockModel->isLocked($classSectionId, $semester, $schoolYear)) {
-                return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-            }
-        }
-
-        // Pull attendance scores once for auto-generated attendance comments
-        $attendanceScores = [];
-        if (!empty($studentIds)) {
-            $attendanceBuilder = $this->semesterScoreModel
-                ->select(['student_id', 'attendance_score'])
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->whereIn('student_id', $studentIds);
-
-            if (is_int($classSectionId) && $classSectionId > 0) {
-                $attendanceBuilder->where('class_section_id', $classSectionId);
-            }
-
-            $rows = $attendanceBuilder->findAll();
-            foreach ($rows as $row) {
-                $attendanceScores[(int)$row['student_id']] = isset($row['attendance_score'])
-                    ? (float)$row['attendance_score']
-                    : null;
-            }
-        }
-
-        helper('attendance_comment');
-
-        $errors = [];
-        $operations = [];
-
-        foreach ($comments as $studentId => $types) {
-            foreach ($types as $scoreType => $commentText) {
-                $normalizedScoreType = strtolower((string)$scoreType);
-                $commentText = trim((string)$commentText);
-
-                // Auto-generate attendance comment when empty based on the student's attendance score
-                if ($normalizedScoreType === 'attendance' && $commentText === '') {
-                    $attendanceScore = $attendanceScores[$studentId] ?? null;
-                    $auto = attendance_comment_from_score($attendanceScore, $studentNames[$studentId] ?? '');
-                    if ($auto !== null) {
-                        $commentText = $auto;
-                    }
-                }
-
-                $reviewText = isset($reviews[$studentId][$scoreType])
-                    ? trim((string)$reviews[$studentId][$scoreType])
-                    : '';
-                // Skip empty comment & empty review to avoid null inserts
-                if ($commentText === '' && $reviewText === '') {
-                    continue;
-                }
-
-                if ($commentText !== '') {
-                    $validationError = $this->validateComment($commentText, (int)$studentId, $normalizedScoreType, $studentNames);
-                    if ($validationError !== null) {
-                        $errors[] = $validationError;
-                        continue;
-                    }
-                }
-
-                $operations[] = [
-                    'student_id' => $studentId,
-                    'class_section_id' => is_int($classSectionId) ? $classSectionId : null,
-                    'score_type' => $normalizedScoreType,
-                    'comment' => $commentText === '' ? null : $commentText,
-                    'review' => $reviewText === '' ? null : $reviewText,
-                ];
-            }
-        }
-
-        if (!empty($errors)) {
-            return redirect()->back()->with('errors', $errors)->withInput();
-        }
-
-        foreach ($operations as $operation) {
-            $existingQuery = $this->scoreCommentModel
-                ->where('student_id', $operation['student_id'])
-                ->where('score_type', $operation['score_type'])
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear);
-
-            if (is_int($classSectionId) && $classSectionId > 0) {
-                $existingQuery->groupStart()
-                    ->where('class_section_id', $classSectionId)
-                    ->orWhere('class_section_id', null); // pick up legacy rows
-                $existingQuery->groupEnd();
-            }
-
-            $existing = $existingQuery->first();
-
-            $data = [
-                'comment' => $operation['comment'],
-                'commented_by' => $teacherId,
-                'class_section_id' => $operation['class_section_id'],
-            ];
-
-            if ($isReviewer && $operation['review'] !== null) {
-                $data['comment_review'] = $operation['review'];
-                $data['reviewed_by'] = $teacherId;
-            }
-
-            if ($existing) {
-                // Update
-                $this->scoreCommentModel->update($existing['id'], $data);
-            } else {
-                // Insert
-                $this->scoreCommentModel->insert(array_merge([
-                    'student_id'   => $operation['student_id'],
-                    'score_type'   => $operation['score_type'],
-                    'semester'     => $semester,
-                    'school_year'  => $schoolYear,
-                    'class_section_id' => $operation['class_section_id'],
-                ], $data));
-            }
-        }
-        return redirect()->back()->with('status', 'Comments updated successfully!');
-    }
-
-    // Helper function to check if current user is a reviewer
-    private function isReviewer()
-    {
-        $currentUserRole = session()->get('role'); // Make sure this matches your session role key
-        
-        // Get reviewer roles from configuration table
-        $reviewerRoles = $this->configModel->getConfig('comment_reviewer');
-        
-        if (!$reviewerRoles) {
-            return false;
-        }
-        
-        // Convert comma-separated string to array and trim whitespace
-        $allowedRoles = array_map('trim', explode(',', $reviewerRoles));
-        
-        // Check if current user role is in the allowed roles
-        return in_array($currentUserRole, $allowedRoles);
-    }
-
-    private function getStudentFirstNames(array $studentIds): array
-    {
-        $ids = array_values(array_filter(array_unique(array_map('intval', $studentIds)), static function ($id) {
-            return $id > 0;
-        }));
-
-        if (empty($ids)) {
-            return [];
-        }
-
-        $rows = $this->studentModel
-            ->select(['id', 'firstname'])
-            ->whereIn('id', $ids)
-            ->findAll();
-
-        $names = [];
-        foreach ($rows as $row) {
-            $names[(int)($row['id'] ?? 0)] = trim((string)($row['firstname'] ?? ''));
-        }
-
-        return $names;
-    }
-
-    private function validateComment(string $comment, int $studentId, string $scoreType, array $studentNames): ?string
-    {
-        $trimmed = trim($comment);
-        if ($trimmed === '') {
-            return null;
-        }
-
-        $firstName = $studentNames[$studentId] ?? '';
-        if ($firstName === '') {
-            return "Missing student first name for student ID {$studentId}.";
-        }
-
-        $length = mb_strlen($trimmed, 'UTF-8');
-        if ($length < 100) {
-            return "{$firstName}'s {$scoreType} comment must be at least 100 characters.";
-        }
-        if ($length > 400) {
-            return "{$firstName}'s {$scoreType} comment must be at most 400 characters.";
-        }
-
-        $pattern = '/^' . preg_quote($firstName, '/') . '\\b/i';
-        if (!preg_match($pattern, $trimmed)) {
-            return "{$firstName}'s {$scoreType} comment must start with the student's first name.";
-        }
-
-        return null;
-    }
-
-    private function normalizeSemesterSelection(?string $input): string
-    {
-        $value = strtolower(trim((string)$input));
-        if ($value === 'fall' || str_contains($value, '1')) {
-            return 'fall';
-        }
-        if ($value === 'spring' || str_contains($value, '2')) {
-            return 'spring';
-        }
-        return '';
-    }
-
-}
diff --git a/app/Http/Controllers/old/ScoreController.php b/app/Http/Controllers/old/ScoreController.php
deleted file mode 100644
index ff24070e..00000000
--- a/app/Http/Controllers/old/ScoreController.php
+++ /dev/null
@@ -1,1438 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use CodeIgniter\Controller;
-use App\Models\TeacherClassModel;
-use App\Models\StudentClassModel;
-use App\Models\StudentModel;
-use App\Models\QuizModel;
-use App\Models\HomeworkModel;
-use App\Models\FinalExamModel;
-use App\Models\MidtermExamModel;
-use App\Models\ProjectModel;
-use App\Models\SemesterScoreModel;
-use App\Models\ConfigurationModel;
-use App\Models\ScoreCommentModel;
-use App\Models\ParticipationModel;
-use App\Models\AttendanceRecordModel;
-use App\Models\AttendanceDataModel;
-use App\Models\ClassSectionModel;
-use App\Models\UserModel;
-use CodeIgniter\Events\Events;
-use Config\Services;
-use App\Models\CalendarModel;
-use App\Services\Calculators\AttendanceCalculator;
-use App\Models\GradingLockModel;
-use App\Models\MissingScoreOverrideModel;
-
-
-
-class ScoreController extends Controller
-{
-    protected $semesterScoreService;
-    protected $db;
-    protected $configModel;
-    protected $semester;
-    protected $schoolYear;
-    protected $classSectionModel;
-    protected $studentClassModel;
-    protected $teacherClassModel;
-    protected $userModel;
-    protected $targetHigh;
-    protected $targetLow;
-    protected $semesterScoreModel;
-    protected $studentModel;
-    protected $calendarModel;
-    protected $attendanceCalculator;
-    protected $gradingLockModel;
-    protected $missingScoreOverrideModel;
-
-    public function __construct()
-    {
-                // Load the database service
-        $this->db = \Config\Database::connect();
-        // Check if the database connection is established
-        if (!$this->db->connect()) {
-            log_message('error', 'Database connection failed.');
-            throw new \Exception('Database connection failed.');
-        } else {
-            log_message('info', 'Database connection successful.');
-        }
-
-        // Initialize the config model
-        $this->configModel = new ConfigurationModel(); 
-        $this->classSectionModel = new ClassSectionModel();
-        $this->teacherClassModel = new TeacherClassModel();
-        $this->semesterScoreModel = new SemesterScoreModel();
-        $this->studentModel = new StudentModel();
-        $this->studentClassModel = new StudentClassModel();
-        $this->userModel = new UserModel();
-        $this->calendarModel = new CalendarModel();
-        $this->attendanceCalculator = new AttendanceCalculator(
-            new AttendanceRecordModel(),
-            $this->configModel,
-            $this->calendarModel
-        );
-        $this->gradingLockModel = new GradingLockModel();
-        $this->missingScoreOverrideModel = new MissingScoreOverrideModel();
-        // Retrieve the configuration values
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->targetHigh = $this->configModel->getConfig('trophy_score');
-        $this->targetLow = $this->configModel->getConfig('pass_score');
-        $this->semesterScoreService = Services::semesterScoreService();
-    }
-
-
-    public function index()
-    {
-        log_message('debug', 'ScoreController::index invoked');
-        $semesterChoiceParam = $this->request->getGet('semester_choice');
-        $session = session();
-        if ($this->request->getGet('choose_semester') !== null) {
-            $session->remove('teacher_scores_selected_semester');
-            $session->remove('semester');
-            $semesterChoiceParam = null;
-        }
-        $normalizedChoice = $this->normalizeSemester($semesterChoiceParam);
-        $sessionSelected = $session->get('teacher_scores_selected_semester');
-        $selectedSemesterLabel = '';
-        if ($normalizedChoice !== '') {
-            $selectedSemesterLabel = ucfirst($normalizedChoice);
-            $session->set('teacher_scores_selected_semester', $selectedSemesterLabel);
-            $session->set('semester', $selectedSemesterLabel);
-        } elseif (!empty($sessionSelected)) {
-            $selectedSemesterLabel = $sessionSelected;
-        } else {
-            $invalidChoice = null;
-            if ($semesterChoiceParam !== null && $semesterChoiceParam !== '') {
-                $invalidChoice = $semesterChoiceParam;
-            }
-            return view('teacher/select_semester', [
-                'fallUrl' => base_url('/teacher/scores?semester_choice=Fall'),
-                'springUrl' => base_url('/teacher/scores?semester_choice=Spring'),
-                'invalidChoice' => $invalidChoice,
-            ]);
-        }
-        $focusTarget = $this->request->getGet('focus');
-        $focusTarget = in_array($focusTarget, ['scores', 'comments'], true) ? $focusTarget : null;
-
-        // Step 1: Get the teacher_id from the session
-        $teacherId = session()->get('user_id');
-        $teacher = $this->userModel->find($teacherId);
-        $teacherFirst = $teacher['firstname'] ?? $teacher['first_name'] ?? '';
-        $teacherLast  = $teacher['lastname']  ?? $teacher['last_name']  ?? '';
-        $teacherName  = ($teacherFirst !== '' || $teacherLast !== '')
-            ? trim($teacherFirst . ' ' . $teacherLast)
-            : 'Unknown';
-
-        $activeSemester = $selectedSemesterLabel;
-        $effectiveSemester = $activeSemester;
-        $effectiveSchoolYear = $this->schoolYear;
-
-        // ✅ Get class section ID for the active term (respect active selection)
-        $assignments = $this->teacherClassModel->getClassAssignmentsByUserId(
-            (int)$teacherId,
-            (string)$effectiveSchoolYear,
-            (string)$effectiveSemester
-        );
-
-        if (empty($assignments)) {
-            // Fallback: any class regardless of term
-            $fallback = $this->teacherClassModel
-                ->where('teacher_id', $teacherId)
-                ->first();
-            if ($fallback) {
-                $assignments = [[
-                    'class_section_id'   => $fallback['class_section_id'],
-                    'class_section_name' => null,
-                    'school_year'        => $fallback['school_year'] ?? $effectiveSchoolYear,
-                    'semester'           => $fallback['semester'] ?? $effectiveSemester,
-                ]];
-                $effectiveSemester   = $fallback['semester'] ?? $effectiveSemester;
-                $effectiveSchoolYear = $fallback['school_year'] ?? $effectiveSchoolYear;
-            } else {
-                log_message('info', 'No class section assigned to teacher ID: ' . $teacherId);
-                return redirect()
-                    ->to('no-classes')
-                    ->with('message', 'You do not have an assigned class yet. Please contact the administration.');
-            }
-        }
-
-        $allowedIds = array_map(static fn($a) => (int)($a['class_section_id'] ?? 0), $assignments);
-        $allowedIds = array_values(array_filter(array_unique($allowedIds)));
-
-        $requestedId = (int)($this->request->getGet('class_section_id') ?? 0);
-        $sessionId   = (int)(session()->get('class_section_id') ?? 0);
-        $chosenAssignment = null;
-        if ($requestedId && in_array($requestedId, $allowedIds, true)) {
-            $classSectionId = $requestedId;
-            foreach ($assignments as $a) {
-                if ((int)$a['class_section_id'] === $requestedId) { $chosenAssignment = $a; break; }
-            }
-        } elseif ($sessionId && in_array($sessionId, $allowedIds, true)) {
-            $classSectionId = $sessionId;
-            foreach ($assignments as $a) {
-                if ((int)$a['class_section_id'] === $sessionId) { $chosenAssignment = $a; break; }
-            }
-        } else {
-            $classSectionId = $allowedIds[0];
-            foreach ($assignments as $a) {
-                if ((int)$a['class_section_id'] === $classSectionId) { $chosenAssignment = $a; break; }
-            }
-        }
-
-        session()->set('class_section_id', $classSectionId);
-
-        if ($chosenAssignment) {
-            $effectiveSemester   = $chosenAssignment['semester'] ?? $effectiveSemester;
-            $effectiveSchoolYear = $chosenAssignment['school_year'] ?? $effectiveSchoolYear;
-        }
-
-        // Build assigned teacher/TA names for this section (current term)
-        $rows = $this->db->table('teacher_class tc')
-            ->select('tc.position, u.firstname, u.lastname')
-            ->join('users u', 'u.id = tc.teacher_id', 'inner')
-            ->where('tc.class_section_id', $classSectionId)
-            ->where('tc.school_year', $effectiveSchoolYear)
-            ->orderBy("FIELD(tc.position,'main','ta')", '', false)
-            ->orderBy('u.firstname', 'ASC')
-            ->get()->getResultArray();
-
-        $mains = [];
-        $tas   = [];
-        foreach ($rows as $r) {
-            $name = trim(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? ''));
-            if ($name === '') continue;
-            $pos = strtolower((string)($r['position'] ?? ''));
-            if (in_array($pos, ['main', 'teacher'], true)) {
-                $mains[] = $name;
-            } elseif (in_array($pos, ['ta', 'assistant', 'teacher_assistant'], true)) {
-                $tas[] = $name;
-            }
-        }
-        if (empty($mains) && !empty($teacherName)) {
-            $mains = [$teacherName];
-        }
-        $mainsText = implode(', ', $mains);
-        $tasText   = implode(', ', $tas);
-
-        // Resolve class section name (by section code)
-        $csRow = $this->db->table('classSection')
-            ->select('class_section_name')
-            ->where('class_section_id', $classSectionId)
-            ->get()->getRowArray();
-        $classSectionName = $csRow['class_section_name'] ?? '';
-        log_message('debug', "ScoreController::index teacher {$teacherId} classSection {$classSectionId} semester {$effectiveSemester}");
-
-        $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId(
-            $classSectionId,
-            $effectiveSemester,
-            $effectiveSchoolYear
-        );
-        if (!empty($studentTeacherInfo) && $this->semesterScoreService !== null) {
-            try {
-                $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo);
-            } catch (\Throwable $e) {
-                log_message('error', 'ScoreController::index semester score refresh failed: ' . $e->getMessage());
-            }
-        }
-
-        // Step 2: Retrieve the student scores data
-        $students = $this->getStudentScores($classSectionId, $effectiveSemester, $effectiveSchoolYear, $teacherId);
-
-        // Step 3: Sort the students array by last name and then by first name
-        usort($students, function ($a, $b) {
-            $lastNameComparison = strcmp($a['lastname'], $b['lastname']);
-            return $lastNameComparison === 0
-                ? strcmp($a['firstname'], $b['firstname'])
-                : $lastNameComparison;
-        });
-
-        if (ENVIRONMENT !== 'production') {
-            $sampleRows = array_map(static function ($student) {
-                return [
-                    'id' => $student['student_id'],
-                    'attendance_score' => $student['attendance_score'] ?? null,
-                    'ptap_score' => $student['ptap_score'] ?? null,
-                    'final_exam' => $student['final_exam'][0] ?? null,
-                ];
-            }, array_slice($students, 0, 5));
-            log_message('debug', 'ScoreController::index sample rows: ' . json_encode($sampleRows));
-        }
-
-        $scoresLocked = $this->gradingLockModel->isLocked(
-            (int) $classSectionId,
-            (string) $effectiveSemester,
-            (string) $effectiveSchoolYear
-        );
-
-        // Step 4: Pass everything to the view
-        $data = [
-            'students' => $students,
-            'teacher_name' => $teacherName,
-            'class_section_id' => $classSectionId,
-            'class_section_name' => $classSectionName,
-            'mainsText' => $mainsText,
-            'tasText'   => $tasText,
-            'activeSemester' => $activeSemester,
-            'selectedSemester' => $activeSemester,
-            'focusTarget' => $focusTarget,
-            'schoolYear' => $effectiveSchoolYear,
-            'scoresLocked' => $scoresLocked,
-        ];
-
-        return view('/teacher/scores', $data);
-    }
-
-    public function submitScoresLock()
-    {
-        $classSectionId = (int) ($this->request->getPost('class_section_id') ?? session()->get('class_section_id') ?? 0);
-        $semesterRaw = (string) ($this->request->getPost('semester') ?? $this->request->getPost('selected_semester') ?? '');
-        $semesterNormalized = $this->normalizeSemester($semesterRaw);
-        $semester = $semesterNormalized !== '' ? ucfirst($semesterNormalized) : $this->semester;
-        $schoolYear = (string) ($this->request->getPost('school_year') ?? $this->schoolYear);
-
-        if ($classSectionId <= 0 || $semester === '' || $schoolYear === '') {
-            return redirect()->back()->with('error', 'Missing class section or term.');
-        }
-
-        $missingOk = $this->request->getPost('missing_ok') ?? [];
-        $studentIds = $this->request->getPost('student_ids') ?? array_keys((array) $missingOk);
-        $studentIds = array_map('intval', (array) $studentIds);
-        $teacherId = (int) (session()->get('user_id') ?? 0);
-        $isFall = strtolower($semester) === 'fall';
-        $isSpring = strtolower($semester) === 'spring';
-
-        $commentTypes = ['ptap_comment'];
-        if ($isFall) {
-            $commentTypes[] = 'midterm_comment';
-        }
-        if ($isSpring) {
-            $commentTypes[] = 'final_comment';
-        }
-
-        foreach ($commentTypes as $type) {
-            $checkedItems = [];
-            if (is_array($missingOk)) {
-                foreach ($missingOk as $studentId => $types) {
-                    if (!is_array($types) || empty($types[$type])) {
-                        continue;
-                    }
-                    $checkedItems[] = [
-                        'student_id' => (int) $studentId,
-                        'item_index' => null,
-                    ];
-                }
-            }
-            $this->missingScoreOverrideModel->replaceOverrides(
-                $classSectionId,
-                (string) $semester,
-                (string) $schoolYear,
-                $type,
-                $studentIds,
-                null,
-                $checkedItems,
-                $teacherId,
-                true
-            );
-        }
-
-        $existing = $this->gradingLockModel->getLock($classSectionId, $semester, $schoolYear);
-        if (!empty($existing) && !empty($existing['is_locked'])) {
-            return redirect()->back()->with('status', 'Scores already submitted and locked.');
-        }
-
-        $userId = $teacherId;
-        if (!empty($existing)) {
-            $this->gradingLockModel->update($existing['id'], [
-                'is_locked' => 1,
-                'locked_by' => $userId > 0 ? $userId : null,
-                'locked_at' => utc_now(),
-            ]);
-        } else {
-            $this->gradingLockModel->insert([
-                'class_section_id' => $classSectionId,
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-                'is_locked' => 1,
-                'locked_by' => $userId > 0 ? $userId : null,
-                'locked_at' => utc_now(),
-            ]);
-        }
-
-        return redirect()->back()->with('status', 'Scores submitted and locked for this semester.');
-    }
-
-    public function noClasses()
-    {
-        return view('/teacher/no_classes');
-    }
-
-    private function getStudentScores(int $classSectionId, $semester, $schoolYear, int $teacherId)
-    {
-        if (!$semester || !$schoolYear) {
-            throw new \RuntimeException('Semester or school year configuration is missing.');
-        }
-
-        $totalSemesterDays = null;
-        $normSemester = $this->normalizeSemester($semester);
-        if ($schoolYear !== '' && $normSemester !== '') {
-            $semRange = $this->getSemesterRange($schoolYear, $normSemester);
-            if ($semRange) {
-                try {
-                    $events = $this->calendarModel->getEventsBySchoolYearAndSemester($schoolYear, $normSemester);
-                    $noSchoolSundays = 0;
-                    foreach ($events as $event) {
-                        if (!empty($event['no_school'])) {
-                            $date = new \DateTime($event['date']);
-                            if ($date->format('N') == 7) {
-                                if ($date->format('Y-m-d') >= $semRange[0] && $date->format('Y-m-d') <= $semRange[1]) {
-                                    $noSchoolSundays++;
-                                }
-                            }
-                        }
-                    }
-                    $totalSemesterDays = $this->countSundays($semRange[0], $semRange[1]) - $noSchoolSundays;
-                } catch (\Throwable $e) {
-                    log_message('error', 'Failed to count sundays for score calculation: ' . $e->getMessage());
-                    $totalSemesterDays = null;
-                }
-            }
-        }
-
-        if ($totalSemesterDays === null) {
-            $totalSemesterDays = strtolower($semester) === 'fall'
-                ? $this->configModel->getConfig('total_semester1_days')
-                : $this->configModel->getConfig('total_semester2_days');
-        }
-
-
-        if (!$totalSemesterDays) {
-            throw new \RuntimeException('Total semester days configuration is missing.');
-        }
-
-        if ($classSectionId <= 0) {
-            throw new \RuntimeException('Invalid class section for the current teacher.');
-        }
-        $students = $this->prepareStudents($classSectionId, $teacherId, $schoolYear);
-        $studentIds = array_keys($students);
-
-        // Load regular scores
-        $this->loadScoresByType(new HomeworkModel(), 'homework', $students, $classSectionId, $semester, $schoolYear);
-        $this->loadScoresByType(new QuizModel(), 'quiz', $students, $classSectionId, $semester, $schoolYear);
-        $this->loadScoresByType(new ProjectModel(), 'project', $students, $classSectionId, $semester, $schoolYear);
-        $this->loadScoresByType(new MidtermExamModel(), 'midterm', $students, $classSectionId, $semester, $schoolYear);
-        $this->loadScoresByType(new FinalExamModel(), 'final_exam', $students, $classSectionId, $semester, $schoolYear);
-        $this->loadScoresByType(new ParticipationModel(), 'participation', $students, $classSectionId, $semester, $schoolYear);
-
-        $this->calculateStudentScores($students, $classSectionId, $semester, $totalSemesterDays);
-
-        // Load all semester scores in one query
-        $this->loadSemesterScores($students, $classSectionId, $semester, $schoolYear);
-
-        $this->loadComments(new ScoreCommentModel(), $students, $studentIds, $semester, $schoolYear);
-
-        $homeworkIndexes = $this->loadIndexedScores(new HomeworkModel(), 'homework_index', $students, $classSectionId, $semester, $schoolYear, 'homework_scores_by_index');
-        $quizIndexes = $this->loadIndexedScores(new QuizModel(), 'quiz_index', $students, $classSectionId, $semester, $schoolYear, 'quiz_scores_by_index');
-        $projectIndexes = $this->loadIndexedScores(new ProjectModel(), 'project_index', $students, $classSectionId, $semester, $schoolYear, 'project_scores_by_index');
-        $this->loadMissingOverrides($students, $classSectionId, $semester, $schoolYear);
-        $this->buildMissingItems($students, $homeworkIndexes, $quizIndexes, $projectIndexes, $semester);
-
-        return $students;
-    }
-
-    private function loadSemesterScores(&$students, $classSectionId, $semester, $schoolYear)
-    {
-        // Get all scores in one query
-        $results = $this->semesterScoreModel->select('student_id, attendance_score, ptap_score, semester_score, midterm_exam_score, final_exam_score')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        foreach ($results as $row) {
-            $studentId = $row['student_id'];
-            
-            if (isset($students[$studentId])) {
-                $attendanceScore = $this->roundScore($row['attendance_score'] ?? null);
-                if ($attendanceScore !== null && !isset($students[$studentId]['attendance_score'])) {
-                    $students[$studentId]['attendance_score'] = $attendanceScore;
-                }
-                $ptapScore = $this->roundScore($row['ptap_score'] ?? null);
-                if ($ptapScore !== null && !isset($students[$studentId]['ptap_score'])) {
-                    $students[$studentId]['ptap_score'] = $ptapScore;
-                }
-                $semesterScore = $this->roundScore($row['semester_score'] ?? null);
-                if ($semesterScore !== null && !isset($students[$studentId]['semester_score'])) {
-                    $students[$studentId]['semester_score'] = $semesterScore;
-                }
-                $midtermScore = $this->roundScore($row['midterm_exam_score'] ?? null);
-                if ($midtermScore !== null && empty($students[$studentId]['midterm'])) {
-                    $students[$studentId]['midterm'][] = $midtermScore;
-                }
-                $finalExamScore = $this->roundScore($row['final_exam_score'] ?? null);
-                if ($finalExamScore !== null && empty($students[$studentId]['final_exam'])) {
-                    $students[$studentId]['final_exam'][] = $finalExamScore;
-                }
-            }
-        }
-    }
-
-    private function roundScore($value): ?float
-    {
-        if ($value === null) {
-            return null;
-        }
-        
-        // Ensure value is numeric before rounding
-        return is_numeric($value) ? round((float)$value, 1) : null;
-    }
-
-    private function prepareStudents($classSectionId, $teacherId, $schoolYear)
-    {
-        $students = [];
-        $studentClasses = $this->studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
-
-        foreach ($studentClasses as $studentClass) {
-            $student = $this->studentModel
-                ->select('id, firstname, lastname, age, school_id')
-                ->where('id', $studentClass['student_id'])
-                ->where('is_active', 1)
-                ->first();
-            if ($student) {
-                $students[$student['id']] = [
-                    'student_id' => $student['id'],
-                    'firstname' => $student['firstname'],
-                    'lastname' => $student['lastname'],
-                    'age' => $student['age'],
-                    'school_id' => $student['school_id'],
-                    'class_section_id' => $classSectionId,
-                    'school_year' => $schoolYear,
-                    'teacher_id' => $teacherId,
-                    'homework' => [],
-                    'quiz' => [],
-                    'midterm' => [],
-                    'final_exam' => [],
-                    'project' => [],
-                    'participation' => [],
-                    'ptap' => [],
-                    'ptap_comment' => '',
-                    'midterm_comment' => '',
-                    'final_comment' => ''
-                ];
-            }
-        }
-        return $students;
-    }
-
-    private function loadScoresByType($model, $type, &$students, $classSectionId, $semester, $schoolYear)
-    {
-        $records = $model->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        foreach ($records as $rec) {
-            if (!isset($students[$rec['student_id']])) {
-                continue;
-            }
-
-            // Only include real numeric scores; leave null/blank out entirely
-            if ($rec['score'] === null || $rec['score'] === '') {
-                continue;
-            }
-
-            if (!is_numeric($rec['score'])) {
-                continue;
-            }
-
-            $students[$rec['student_id']][$type][] = (float) $rec['score'];
-        }
-    }
-
-    private function loadIndexedScores($model, string $indexField, array &$students, int $classSectionId, $semester, $schoolYear, string $storeKey): array
-    {
-        $records = $model->select("student_id, {$indexField} as idx, score")
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        $indexes = [];
-        foreach ($records as $rec) {
-            $sid = (int) ($rec['student_id'] ?? 0);
-            $idx = (int) ($rec['idx'] ?? 0);
-            if ($idx <= 0) {
-                continue;
-            }
-            $indexes[$idx] = true;
-            if (isset($students[$sid])) {
-                if (!isset($students[$sid][$storeKey]) || !is_array($students[$sid][$storeKey])) {
-                    $students[$sid][$storeKey] = [];
-                }
-                $students[$sid][$storeKey][$idx] = $rec['score'] ?? null;
-            }
-        }
-
-        $indexList = array_keys($indexes);
-        sort($indexList, SORT_NUMERIC);
-        return $indexList;
-    }
-
-    private function loadComments($commentModel, &$students, $studentIds, $semester, $schoolYear)
-    {
-        if (empty($studentIds)) return;
-
-        $semVariants = array_values(array_unique(array_filter([
-            $semester,
-            strtolower((string)$semester),
-            ucfirst(strtolower((string)$semester)),
-        ], static fn($v) => $v !== '')));
-
-        $comments = $commentModel->whereIn('student_id', $studentIds)
-            ->whereIn('semester', $semVariants)
-            ->where('school_year', $schoolYear)
-            ->findAll();
-
-        foreach ($comments as $comment) {
-            $sid = $comment['student_id'];
-            if (!isset($students[$sid])) continue;
-            
-            $type = strtolower($comment['score_type']);
-            
-            // Set both comment and comment_review for each type
-            if ($type === 'ptap') {
-                $students[$sid]['ptap_comment'] = $comment['comment'];
-                $students[$sid]['ptap_comment_review'] = $comment['comment_review'] ?? null;
-            } 
-            elseif ($type === 'midterm') {
-                $students[$sid]['midterm_comment'] = $comment['comment'];
-                $students[$sid]['midterm_comment_review'] = $comment['comment_review'] ?? null;
-            } 
-            elseif ($type === 'final') {
-                $students[$sid]['final_comment'] = $comment['comment'];
-                $students[$sid]['final_comment_review'] = $comment['comment_review'] ?? null;
-            }
-            elseif ($type === 'attendance' || $type === 'attendance_comment') {
-                $students[$sid]['attendance_comment'] = $comment['comment'];
-                $students[$sid]['attendance_comment_review'] = $comment['comment_review'] ?? null;
-            }
-        }
-
-        // Fallback: if no attendance comment saved, derive one from score for display
-        helper('attendance_comment');
-        foreach ($students as $sid => &$student) {
-            if (!isset($student['attendance_comment']) && isset($student['attendance_score'])) {
-                $student['attendance_comment'] = attendance_comment_from_score(
-                    $student['attendance_score'],
-                    $student['firstname'] ?? ''
-                );
-            }
-        }
-    }
-
-    private function loadMissingOverrides(array &$students, int $classSectionId, $semester, $schoolYear): void
-    {
-        if ($classSectionId <= 0 || empty($students)) {
-            return;
-        }
-
-        $rows = $this->missingScoreOverrideModel
-            ->select('student_id, item_type, item_index')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->where('is_allowed', 1)
-            ->findAll();
-
-        foreach ($rows as $row) {
-            $sid = (int) ($row['student_id'] ?? 0);
-            if (!isset($students[$sid])) {
-                continue;
-            }
-            $type = (string) ($row['item_type'] ?? '');
-            if ($type === '') {
-                continue;
-            }
-            $idx = isset($row['item_index']) ? (int) $row['item_index'] : 0;
-            if (!isset($students[$sid]['missing_ok'])) {
-                $students[$sid]['missing_ok'] = [];
-            }
-            if (!isset($students[$sid]['missing_ok'][$type])) {
-                $students[$sid]['missing_ok'][$type] = [];
-            }
-            $students[$sid]['missing_ok'][$type][$idx] = true;
-        }
-    }
-
-    private function buildMissingItems(array &$students, array $homeworkIndexes, array $quizIndexes, array $projectIndexes, $semester): void
-    {
-        $isFall = strtolower((string) $semester) === 'fall';
-        $isSpring = strtolower((string) $semester) === 'spring';
-
-        foreach ($students as $sid => &$student) {
-            $missing = [];
-            $missingOk = $student['missing_ok'] ?? [];
-            $isAllowed = static function (array $missingOk, string $type, ?int $idx = null): bool {
-                $key = $idx === null ? 0 : $idx;
-                return !empty($missingOk[$type][$key]);
-            };
-
-            foreach ($homeworkIndexes as $idx) {
-                $val = $student['homework_scores_by_index'][$idx] ?? null;
-                if (($val === null || $val === '' || !is_numeric($val)) && !$isAllowed($missingOk, 'homework', $idx)) {
-                    $missing[] = 'Homework ' . $idx;
-                }
-            }
-
-            foreach ($quizIndexes as $idx) {
-                $val = $student['quiz_scores_by_index'][$idx] ?? null;
-                if (($val === null || $val === '' || !is_numeric($val)) && !$isAllowed($missingOk, 'quiz', $idx)) {
-                    $missing[] = 'Quiz ' . $idx;
-                }
-            }
-
-            foreach ($projectIndexes as $idx) {
-                $val = $student['project_scores_by_index'][$idx] ?? null;
-                if (($val === null || $val === '' || !is_numeric($val)) && !$isAllowed($missingOk, 'project', $idx)) {
-                    $missing[] = 'Project ' . $idx;
-                }
-            }
-
-            if (empty($student['participation']) && !$isAllowed($missingOk, 'participation', 0)) {
-                $missing[] = 'Participation';
-            }
-
-            if ($isFall && empty($student['midterm']) && !$isAllowed($missingOk, 'midterm_exam', 0)) {
-                $missing[] = 'Midterm Exam';
-            }
-
-            if ($isSpring && empty($student['final_exam']) && !$isAllowed($missingOk, 'final_exam', 0)) {
-                $missing[] = 'Final Exam';
-            }
-
-            $ptapComment = trim((string) ($student['ptap_comment'] ?? ''));
-            if ($ptapComment === '' && !$isAllowed($missingOk, 'ptap_comment', 0)) {
-                $missing[] = 'PTAP Comment';
-            }
-
-            if ($isFall) {
-                $midtermComment = trim((string) ($student['midterm_comment'] ?? ''));
-                if ($midtermComment === '' && !$isAllowed($missingOk, 'midterm_comment', 0)) {
-                    $missing[] = 'Midterm Comment';
-                }
-            }
-
-            if ($isSpring) {
-                $finalComment = trim((string) ($student['final_comment'] ?? ''));
-                if ($finalComment === '' && !$isAllowed($missingOk, 'final_comment', 0)) {
-                    $missing[] = 'Final Comment';
-                }
-            }
-
-            $student['missing_items'] = $missing;
-        }
-    }
-
-    private function calculateStudentScores(&$students, int $classSectionId, $semester, $totalDays)
-    {
-        foreach ($students as $sid => &$s) {
-            $attendanceScore = $this->calculateAttendanceScoreForStudent(
-                $sid,
-                $classSectionId,
-                $semester,
-                $s['school_year'] ?? '',
-                $totalDays
-            );
-            if ($attendanceScore === null) {
-                $attendanceScore = 100.0;
-            }
-            $attendance = $attendanceScore;
-
-            $homeworkScores = array_values(array_filter(
-                $s['homework'],
-                static fn($score) => $score !== null && $score !== '' && is_numeric($score)
-            ));
-            $avgHomework = !empty($homeworkScores) ? array_sum($homeworkScores) / count($homeworkScores) : null;
-
-            $quizScores = array_values(array_filter(
-                $s['quiz'],
-                static fn($score) => $score !== null && $score !== '' && is_numeric($score)
-            ));
-            $avgQuiz = !empty($quizScores) ? array_sum($quizScores) / count($quizScores) : null;
-
-            $projectScores = array_values(array_filter(
-                $s['project'],
-                static fn($score) => $score !== null && $score !== '' && is_numeric($score)
-            ));
-            $avgProject = !empty($projectScores) ? array_sum($projectScores) / count($projectScores) : null;
-
-            $participationScores = array_values(array_filter(
-                $s['participation'],
-                static fn($score) => $score !== null && $score !== '' && is_numeric($score)
-            ));
-            $avgParticipation = !empty($participationScores) ? array_sum($participationScores) / count($participationScores) : null;
-
-            $ptap = $this->calculatePtapScore($avgHomework, $avgQuiz, $avgProject, $avgParticipation);
-
-            $midterm = (!empty($s['midterm']) && $s['midterm'][0] !== null && $s['midterm'][0] !== '')
-                ? (float) $s['midterm'][0]
-                : null;
-            $final = (!empty($s['final_exam']) && $s['final_exam'][0] !== null && $s['final_exam'][0] !== '')
-                ? (float) $s['final_exam'][0]
-                : null;
-
-            $score = null;
-            if ($ptap !== null) {
-                $score = 0.2 * $ptap + 0.2 * $attendance;
-                if (strtolower($semester) === 'fall') {
-                    if ($midterm !== null) {
-                        $score += 0.6 * $midterm;
-                    } else {
-                        $score = null;
-                    }
-                } else {
-                    if ($final !== null) {
-                        $score += 0.6 * $final;
-                    } else {
-                        $score = null;
-                    }
-                }
-            }
-
-            $s['average_homework'] = $avgHomework !== null ? round($avgHomework, 1) : null;
-            $s['average_quiz'] = $avgQuiz !== null ? round($avgQuiz, 1) : null;
-            $s['average_project'] = $avgProject !== null ? round($avgProject, 1) : null;
-            $s['average_participation'] = $avgParticipation !== null ? round($avgParticipation, 1) : null;
-            $s['ptap_score'] = $ptap !== null ? round($ptap, 1) : null;
-            $s['midterm_score'] = $midterm !== null ? round($midterm, 1) : null;
-            $s['final_exam_score'] = $final !== null ? round($final, 1) : null;
-            $s['attendance_score'] = round($attendanceScore, 1);
-            $s['semester_score'] = $score !== null ? round(min($score, 100), 1) : null;
-        }
-    }
-
-    private function calculateAttendanceScoreForStudent(
-        int $studentId,
-        int $classSectionId,
-        string $semester,
-        string $schoolYear,
-        ?int $totalDays
-    ): ?float {
-        $score = $this->getAttendanceScoreFromCalculator(
-            $studentId,
-            $semester,
-            $schoolYear,
-            $classSectionId
-        );
-        if ($score !== null) {
-            return $score;
-        }
-        return $this->calculateAttendanceScoreFallback(
-            $studentId,
-            $semester,
-            $schoolYear,
-            $totalDays
-        );
-    }
-
-    private function getAttendanceScoreFromCalculator(
-        int $studentId,
-        string $semester,
-        string $schoolYear,
-        int $classSectionId
-    ): ?float {
-        try {
-            $result = $this->attendanceCalculator->calculate($studentId, $semester, $schoolYear, $classSectionId);
-            $score = $result['attendance_score'] ?? null;
-            if ($score === null || $score === '') {
-                return null;
-            }
-            return (float) $score;
-        } catch (\Throwable $e) {
-            log_message(
-                'error',
-                'ScoreController::getAttendanceScoreFromCalculator failed for '
-                . "student {$studentId}: " . $e->getMessage()
-            );
-        }
-        return null;
-    }
-
-    private function calculateAttendanceScoreFallback(
-        int $studentId,
-        string $semester,
-        string $schoolYear,
-        ?int $totalDays
-    ): ?float {
-        if ($totalDays === null || $totalDays <= 0) {
-            return 100.0;
-        }
-
-        $attendanceDataModel = new AttendanceDataModel();
-        $absences = $attendanceDataModel
-            ->where('student_id', $studentId)
-            ->where('semester', $semester)
-            ->where('school_year', $schoolYear)
-            ->where('status', 'absent')
-            ->countAllResults();
-
-        return max(0, ((($totalDays - $absences) / $totalDays) * 100));
-    }
-
-    /**
-     * PTAP weighting rules (tests are represented by quiz averages):
-     * - No tests and no projects: 50% homework, 50% participation.
-     * - No projects: 40% homework, 40% participation, 20% tests.
-     * - No tests: 34% homework, 33% participation, 33% projects.
-     * - All available: 30% homework, 30% participation, 30% projects, 10% tests.
-     */
-    private function calculatePtapScore(?float $avgHomework, ?float $avgQuiz, ?float $avgProject, ?float $avgParticipation): ?float
-    {
-        $hasTests = $avgQuiz !== null;
-        $hasProjects = $avgProject !== null;
-
-        if (!$hasTests && !$hasProjects) {
-            if ($avgHomework === null || $avgParticipation === null) {
-                return null;
-            }
-            return round(($avgHomework * 0.5) + ($avgParticipation * 0.5), 1);
-        }
-
-        if (!$hasProjects) {
-            if ($avgHomework === null || $avgParticipation === null || $avgQuiz === null) {
-                return null;
-            }
-            return round(($avgHomework * 0.4) + ($avgParticipation * 0.4) + ($avgQuiz * 0.2), 1);
-        }
-
-        if (!$hasTests) {
-            if ($avgHomework === null || $avgParticipation === null || $avgProject === null) {
-                return null;
-            }
-            return round(($avgHomework * 0.34) + ($avgParticipation * 0.33) + ($avgProject * 0.33), 1);
-        }
-
-        if ($avgHomework === null || $avgParticipation === null || $avgProject === null || $avgQuiz === null) {
-            return null;
-        }
-
-        return round(
-            ($avgHomework * 0.3) + ($avgParticipation * 0.3) + ($avgProject * 0.3) + ($avgQuiz * 0.1),
-            1
-        );
-    }
-
-    private function getHomeworkCount(int $classSectionId, string $semester, string $schoolYear): int
-    {
-        if ($classSectionId <= 0 || $semester === '' || $schoolYear === '') {
-            return 0;
-        }
-
-        $builder = $this->db->table('homework')
-            ->select('COUNT(DISTINCT homework_index) AS hw_count')
-            ->where('class_section_id', $classSectionId)
-            ->where('semester', $semester);
-
-        if ($schoolYear !== '') {
-            $builder->where('school_year', $schoolYear);
-        }
-
-        $row = $builder->get()->getRow();
-
-        // Fallback: if none found (school_year not populated), drop school_year filter
-        if ((!$row || $row->hw_count === null) && $schoolYear !== '') {
-            $row = $this->db->table('homework')
-                ->select('COUNT(DISTINCT homework_index) AS hw_count')
-                ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
-                ->get()
-                ->getRow();
-        }
-
-        return ($row && $row->hw_count !== null) ? (int) $row->hw_count : 0;
-    }
-
-    private function saveFinalScores($students, $model, $teacherId, $classSectionId, $semester, $schoolYear)
-    {
-        foreach ($students as $s) {
-            $existing = $model->where('student_id', $s['student_id'])
-                ->where('class_section_id', $classSectionId)
-                ->where('semester', $semester)
-                ->where('school_year', $schoolYear)
-                ->first();
-
-            $data = [
-                'student_id' => $s['student_id'],
-                'class_section_id' => $classSectionId,
-                'updated_by' => $teacherId,
-                'score' => $s['semester_score'],
-                'score_letter' => $this->convertScoreToLetter($s['semester_score']),
-                'semester' => $semester,
-                'school_year' => $schoolYear,
-                'updated_at' => utc_now(),
-            ];
-
-            if ($existing) $model->update($existing['id'], $data);
-            else {
-                $data['created_at'] = utc_now();
-                $model->save($data);
-            }
-        }
-    }
-
-
-
-
-    private function convertScoreToLetter($score)
-    {
-        // Example conversion function, adjust logic as needed
-        if ($score >= 90) {
-            return 'A';
-        } elseif ($score >= 80) {
-            return 'B';
-        } elseif ($score >= 70) {
-            return 'C';
-        } elseif ($score >= 60) {
-            return 'D';
-        } else {
-            return 'F';
-        }
-    }
-
-    private function resolveActiveSemester(): string
-    {
-        $session = session();
-        $selected = $session->get('teacher_scores_selected_semester');
-        if (!empty($selected)) {
-            return (string) $selected;
-        }
-        return $session->get('semester') ?? $this->semester;
-    }
-
-    protected function normalizeSemester(?string $input): string
-    {
-        $s = strtolower(trim((string)$input));
-        if ($s === 'fall' || str_contains($s, '1')) return 'fall';
-        if ($s === 'spring' || str_contains($s, '2')) return 'spring';
-        return '';
-    }
-
-    protected function getSemesterRange(string $schoolYear, string $semester): ?array
-    {
-        $norm = $this->normalizeSemester($semester);
-        if ($norm === '' || !preg_match('/^(\\d{4})/', trim($schoolYear), $m)) {
-            return null;
-        }
-        $y1 = (int)$m[1];
-        $y2 = $y1 + 1;
-
-        $fallStartCfg   = (string)($this->configModel->getConfig('fall_semester_start')   ?? '');
-        $fallEndCfg     = (string)($this->configModel->getConfig('fall_end_date')     ?? ''); // e.g., 'YYYY-01-15'
-        $springStartCfg = (string)($this->configModel->getConfig('spring_semester_start') ?? ''); // e.g., 'YYYY-01-16'
-        $springEndCfg   = (string)($this->configModel->getConfig('last_school_day')   ?? '');
-
-        if ($norm === 'fall') {
-            $start = ($fallStartCfg !== '') ? date($y1 . '-m-d', strtotime($fallStartCfg)) : "{$y1}-09-01";
-            $end   = ($fallEndCfg   !== '') ? date($y2 . '-m-d', strtotime($fallEndCfg))   : "{$y2}-01-15";
-            return [$start, $end];
-        }
-
-        if ($norm === 'spring') {
-            $start = ($springStartCfg !== '') ? date($y2 . '-m-d', strtotime($springStartCfg)) : "{$y2}-01-16";
-            $end   = ($springEndCfg   !== '') ? date($y2 . '-m-d', strtotime($springEndCfg))   : "{$y2}-06-30";
-            return [$start, $end];
-        }
-
-        return null;
-    }
-
-    private function countSundays(string $startDate, string $endDate): int
-    {
-        $start = new \DateTime($startDate);
-        $end = new \DateTime($endDate);
-        $sundays = 0;
-        $interval = new \DateInterval('P1D');
-        $period = new \DatePeriod($start, $interval, $end->modify('+1 day')); // include end date
-
-        foreach ($period as $day) {
-            if ($day->format('N') == 7) {
-                $sundays++;
-            }
-        }
-        return $sundays;
-    }
-
-
-    public function updateFinalExamScores()
-    {
-        return $this->updateScores('final_exam');
-    }
-
-    public function updateFinalExamScoresForGrading()
-    {
-        return $this->updateScores('final_exam', base_url('grading'));
-    }
-
-    public function updateMidtermScores()
-    {
-        return $this->updateScores('midterm_exam');
-    }
-
-    public function updateScores(string $table, ?string $redirectUrl = null)
-    {
-        $builder = $this->db->table($table);
-
-        $scores = $this->request->getPost('final_score');  // name must match input form
-        $teacherId = session()->get('user_id');
-        $classSectionId = session()->get('class_section_id');
-        $semester = $this->resolveActiveSemester();
-        $affectedStudents = [];
-
-        $classSectionId = (int) ($classSectionId ?? 0);
-        if ($classSectionId > 0 && $this->gradingLockModel->isLocked($classSectionId, $semester, $this->schoolYear)) {
-            return redirect()->back()->with('error', 'Scores are locked for this class. Unlock to edit.');
-        }
-
-        if (is_array($scores) && in_array($table, ['midterm_exam', 'final_exam'], true)) {
-            $missingOk = $this->request->getPost('missing_ok') ?? [];
-            $studentIds = array_keys($scores);
-            $checkedItems = [];
-            if (is_array($missingOk)) {
-                foreach ($missingOk as $studentId => $flags) {
-                    $checkedItems[] = [
-                        'student_id' => (int) $studentId,
-                        'item_index' => null,
-                    ];
-                }
-            }
-            $this->missingScoreOverrideModel->replaceOverrides(
-                $classSectionId,
-                (string) $semester,
-                (string) $this->schoolYear,
-                $table === 'midterm_exam' ? 'midterm_exam' : 'final_exam',
-                $studentIds,
-                null,
-                $checkedItems,
-                $teacherId,
-                true
-            );
-        }
-
-        if (is_array($scores)) {
-            foreach ($scores as $studentId => $data) {
-                if (!is_numeric($studentId)) {
-                    continue;
-                }
-
-                $rawScore = $data['score'] ?? null;
-                $normalizedScore = is_numeric($rawScore) ? (float) $rawScore : null;
-
-                // Check if a record already exists for this student
-                $existing = $builder
-                    ->where('student_id', $studentId)
-                    ->where('class_section_id', $classSectionId)
-                    ->where('semester', $semester)
-                    ->where('school_year', $this->schoolYear)
-                    ->get()
-                    ->getRow();
-
-                $insertData = [
-                    'student_id' => $studentId,
-                    'class_section_id' => $classSectionId,
-                    'updated_by' => $teacherId,
-                'score' => $normalizedScore,
-                //'comment' => $data['comment'] ?? null,
-                    'semester' => $semester,
-                'school_year' => $this->schoolYear,
-                'updated_at' => utc_now()
-            ];
-
-                if (strcasecmp($table, 'quiz') === 0) {
-                    $insertData['quiz_index'] = $data['quiz_index'] ?? null;
-                }
-
-                if ($existing) {
-                    // Update existing
-                    $builder->where('id', $existing->id)->update($insertData);
-                } else {
-                    // Insert new
-                    $insertData['created_at'] = utc_now();
-                    $builder->insert($insertData);
-                }
-
-                // Track student for events (avoid duplicates)
-                $affectedStudents[(int)$studentId] = true;
-            }
-        }
-
-        // If final exam scores updated during Spring, trigger finalScoreReleased for these students
-        if (strcasecmp($table, 'final_exam') === 0 && strcasecmp((string)$this->semester, 'Spring') === 0 && !empty($affectedStudents)) {
-            $ids = array_keys($affectedStudents);
-            $payload = ['students' => array_map(static fn($sid) => ['id' => (int)$sid], $ids)];
-            //Events::trigger('finalScoreReleased', $payload);
-        }
-
-        // Ensure semester_scores are re-calculated when midterm/final exams change.
-        if (in_array(strtolower($table), ['final_exam', 'midterm_exam'], true) && $this->semesterScoreService !== null) {
-            try {
-                $studentTeacherInfo = $this->studentModel->getStudentInfoByClassSectionId(
-                    $classSectionId,
-                    $semester,
-                    $this->schoolYear
-                );
-                if (!empty($studentTeacherInfo)) {
-                    $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $this->schoolYear);
-                }
-            } catch (\Throwable $e) {
-                log_message('error', 'semester score resync failed after exam update: ' . $e->getMessage());
-            }
-        }
-
-        $statusMessage = ucfirst($table) . ' scores updated successfully.';
-        if ($redirectUrl !== null) {
-            return redirect()->to($redirectUrl)->with('status', $statusMessage);
-        }
-        return redirect()->back()->with('status', $statusMessage);
-    }
-
-
-    private function fetchAndOrganizeScores($db, &$organizedScores, $tableName, $parentId, $selectedYear, $selectedSemester)
-    {
-        // Only supports semester_scores table in this context
-        if ($tableName !== 'semester_scores') {
-            return;
-        }
-
-        // Define the columns to select
-        $columns = [
-            'students.id as student_id',
-            'students.school_id',
-            'students.firstname as student_firstname',
-            'students.lastname as student_lastname',
-            'classSection.class_section_name',
-            "$tableName.homework_avg",
-            "$tableName.quiz_avg",
-            "$tableName.project_avg",
-            "$tableName.midterm_exam_score",
-            "$tableName.final_exam_score",
-            "$tableName.attendance_score",
-            "$tableName.test_avg",
-            "$tableName.semester_score",
-            "$tableName.school_year",
-            "$tableName.semester",
-            "$tableName.created_at",
-            "$tableName.updated_at"
-            //  "$tableName.comment"
-        ];
-
-
-        // Build the query
-        $builder = $db->table($tableName);
-        $builder->select(implode(', ', $columns));
-        $builder->join('students', 'students.id = ' . $tableName . '.student_id');
-        // Join on the correct foreign key: classSection.class_section_id
-        $builder->join('classSection', 'classSection.class_section_id = ' . $tableName . '.class_section_id');
-        $builder->where('students.parent_id', $parentId)
-            ->where("$tableName.school_year", $selectedYear)
-            ->where("$tableName.semester", $selectedSemester);
-
-        $scores = $builder->get()->getResultArray();
-
-        foreach ($scores as $score) {
-            if (!isset($score['school_id'])) {
-                log_message('error', "Missing school_id for student ID: " . ($score['student_id'] ?? 'unknown'));
-                continue;
-            }
-
-            $schoolYear = $score['school_year'];
-            $semester = $score['semester'];
-            $studentSchoolId = $score['school_id'];
-
-            if (!isset($organizedScores[$schoolYear][$semester][$studentSchoolId])) {
-                $organizedScores[$schoolYear][$semester][$studentSchoolId] = [
-                    'student_firstname'     => $score['student_firstname'],
-                    'student_lastname'      => $score['student_lastname'],
-                    'class_section_name'    => $score['class_section_name'],
-                    'school_id'     => $studentSchoolId, // ✅ Add this line
-                    'scores'                => [],
-                    // 'comment'               => $score['comment'] ?? ''
-                ];
-            }
-
-
-            // Organize each category
-            $organizedScores[$schoolYear][$semester][$studentSchoolId]['scores'] = [
-                'homework'     => ['score' => $score['homework_avg']],
-                'quiz'         => ['score' => $score['quiz_avg']],
-                'project'      => ['score' => $score['project_avg']],
-                'midterm_exam' => ['score' => $score['midterm_exam_score']],
-                'final_exam'   => ['score' => $score['final_exam_score']],
-                'attendance'   => ['score' => $score['attendance_score']],
-                'test_avg'     => ['score' => $score['test_avg']],
-                'semester'     => ['score' => $score['semester_score']],
-            ];
-
-            // Optionally include comment
-            $organizedScores[$schoolYear][$semester][$studentSchoolId]['comment'] = $score['comment'] ?? '';
-        }
-    }
-
-
-public function viewStudentScore()
-{
-    $parentId = session()->get('user_id');
-    $userType = $_SESSION['user_type'];
-    $firstParentId = null;
-    $releaseFall = $this->getParentScoresReleasedForSemester('Fall');
-    $releaseSpring = $this->getParentScoresReleasedForSemester('Spring');
-    $releaseAny = $releaseFall || $releaseSpring;
-
-    // Identify the firstparent based on user type
-    if ($userType === 'primary') {
-        $firstParentId = $parentId;
-    } elseif ($userType === 'secondary') {
-        $parentData = $this->db->table('parents')
-            ->select('parent_id')
-            ->where('secondparent_user_id', $parentId)
-            ->get()
-            ->getRowArray();
-
-        if ($parentData) {
-            $firstParentId = $parentData['parent_id'];
-        }
-    } elseif ($userType === 'tertiary') {
-        $authUserData = $this->db->table('authorized_users')
-            ->select('user_id as parent_id')
-            ->where('authorized_user_id', $parentId)
-            ->get()
-            ->getRowArray();
-
-        if ($authUserData) {
-            $firstParentId = $authUserData['parent_id'];
-        }
-    }
-
-    if (!$firstParentId) {
-        return redirect()->back()->with('error', 'Unable to retrieve student data. Please contact support.');
-    }
-
-    // Handle selected school year (parents can view scores for any available year)
-    $selectedYear = $this->request->getVar('school_year') ?? $this->schoolYear;
-
-    // Fetch distinct school years only from semester_scores
-    $query = $this->db->table('semester_scores')
-        ->select('school_year')
-        ->distinct()
-        ->get();
-
-    $schoolYears = array_column($query->getResultArray(), 'school_year');
-    $schoolYears = array_unique($schoolYears);
-    rsort($schoolYears);
-
-    // Initialize scores array
-    $scores = [];
-
-    // First get all students with their class section info for this parent
-$students = $this->db->table('students')
-    ->select('students.id, students.school_id, students.firstname, students.lastname, classSection.class_section_name AS class_section_name')
-    ->join('student_class', 'student_class.student_id = students.id', 'left')
-    // Join using class_section_id FK stored in student_class
-    ->join('classSection', 'classSection.class_section_id = student_class.class_section_id', 'left')
-    ->where('students.parent_id', $firstParentId)
-    ->get()
-    ->getResultArray();
-
-    if (!empty($students)) {
-        $studentIdList = array_column($students, 'id');
-
-        // Fetch data from semester_scores for these students
-        $semesterScores = $this->db->table('semester_scores')
-            ->whereIn('student_id', $studentIdList)
-            ->where('school_year', $selectedYear)
-            ->get()
-            ->getResultArray();
-
-        $scoresByStudent = [];
-        foreach ($semesterScores as $score) {
-            $studentIdKey = (int)($score['student_id'] ?? 0);
-            $semesterName = trim((string)($score['semester'] ?? ''));
-            if ($studentIdKey === 0 || $semesterName === '') {
-                continue;
-            }
-            $normalizedSemester = ucfirst(strtolower($semesterName));
-            $scoresByStudent[$studentIdKey][$normalizedSemester] = $score;
-        }
-
-        foreach ($students as $student) {
-            $studentId = (int)$student['id'];
-            if (empty($scoresByStudent[$studentId])) {
-                continue;
-            }
-            foreach ($scoresByStudent[$studentId] as $semester => $score) {
-                $releaseScores = (strcasecmp($semester, 'Fall') === 0) ? $releaseFall
-                    : ((strcasecmp($semester, 'Spring') === 0) ? $releaseSpring : $releaseAny);
-                $scores[$selectedYear][$semester][$studentId] = [
-                    'student_id' => $studentId,
-                    'school_id' => $student['school_id'],
-                    'student_firstname' => $student['firstname'],
-                    'student_lastname' => $student['lastname'],
-                    'class_section_name' => $student['class_section_name'] ?? 'Unknown Class',
-                    'comment' => $score['comment'] ?? null,
-                    'scores' => [
-                        'homework' => ['score' => $score['homework_avg'] ?? '-'],
-                        'quiz' => ['score' => $score['quiz_avg'] ?? '-'],
-                        'project' => ['score' => $score['project_avg'] ?? '-'],
-                        'attendance' => ['score' => $score['attendance_score'] ?? '-'],
-                        'participation_score' => ['score' => $score['participation_score'] ?? '-'],
-                        'ptap' => ['score' => $releaseScores ? ($score['ptap_score'] ?? '-') : '-'],
-                        'midterm_exam' => ['score' => $releaseScores ? ($score['midterm_exam_score'] ?? '-') : '-'],
-                        'final_exam' => ['score' => $releaseScores ? ($score['final_exam_score'] ?? '-') : '-'],
-                        'semester' => ['score' => $releaseScores ? ($score['semester_score'] ?? '-') : '-']
-                    ]
-                ];
-            }
-        }
-    }
-
-    return view('/parent/scores', [
-        'organizedScores' => $scores,
-        'schoolYears' => $schoolYears,
-        'selectedYear' => $selectedYear,
-        'semesterOrder' => ['Fall', 'Spring'],
-        'showExamScores' => $releaseAny,
-        'showExamScoresBySemester' => [
-            'Fall' => $releaseFall,
-            'Spring' => $releaseSpring,
-        ],
-    ]);
-}
-
-private function getParentScoresReleasedForSemester(string $semester): bool
-{
-    $key = $this->getParentReleaseKey($semester);
-    $raw = $key ? $this->configModel->getConfig($key) : null;
-    $raw = (string) ($raw ?? '');
-    return in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'y', 'on'], true);
-}
-
-private function getParentReleaseKey(string $semester): ?string
-{
-    $s = strtolower(trim($semester));
-    if ($s === 'fall') {
-        return 'parent_scores_released_fall';
-    }
-    if ($s === 'spring') {
-        return 'parent_scores_released_spring';
-    }
-    return null;
-}
-
-
-
-}
diff --git a/app/Http/Controllers/old/ScorePredictor.php b/app/Http/Controllers/old/ScorePredictor.php
deleted file mode 100644
index a17d1ef4..00000000
--- a/app/Http/Controllers/old/ScorePredictor.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use App\Models\ConfigurationModel;
-use App\Models\ClassSectionModel; 
-
-use CodeIgniter\Controller;
-
-class ScorePredictor extends Controller
-{
-    protected $db;
-    protected $configModel;
-    protected $semester;
-    protected $schoolYear;
-    protected $classSectionModel;
-    protected $studentClassModel;
-    protected $teacherModel;
-    protected $userModel;
-    protected $targetTrophy;
-    protected $targetLow;
-
-    public function __construct()
-    {
-                // Load the database service
-        $this->db = \Config\Database::connect();
-        // Check if the database connection is established
-        if (!$this->db->connect()) {
-            log_message('error', 'Database connection failed.');
-            throw new \Exception('Database connection failed.');
-        } else {
-            log_message('info', 'Database connection successful.');
-        }
-
-        // Initialize the config model
-        $this->configModel = new ConfigurationModel(); 
-        $this->classSectionModel = new ClassSectionModel();
-
-        // Retrieve the configuration values
-        $this->semester = $this->configModel->getConfig('semester');
-        $this->schoolYear = $this->configModel->getConfig('school_year');
-        $this->targetTrophy = $this->configModel->getConfig('trophy_score');
-        $this->targetLow = $this->configModel->getConfig('pass_score');
-    }
-
-    // Calculate the normal cumulative distribution function (CDF)
-    public static function normalCDF($z)
-    {
-        $t = 1 / (1 + 0.3275911 * abs($z));
-        $a1 = 0.254829592;
-        $a2 = -0.284496736;
-        $a3 = 1.421413741;
-        $a4 = -1.453152027;
-        $a5 = 1.061405429;
-        $erf = 1 - ((((($a5 * $t + $a4) * $t + $a3) * $t + $a2) * $t + $a1) * $t) * exp(-$z * $z);
-        $sign = $z < 0 ? -1 : 1;
-        return 0.5 * (1 + $sign * $erf);
-    }
-
-    public function combinedReport()
-    {
-        $request = service('request');
-        $currentSchoolYear = $this->schoolYear;
-
-        $selectedYear = $request->getVar('school_year') ?? $currentSchoolYear;
-        $classSectionId = $request->getVar('class_section_id');
-        // Only show class sections that have at least one student in the selected year
-        $classSections = $this->db->table('classSection cs')
-            ->select('cs.*')
-            ->join('student_class sc', 'sc.class_section_id = cs.class_section_id', 'inner')
-            ->where('sc.school_year', $selectedYear)
-            ->notLike('cs.class_section_name', 'KG', 'after')
-            ->groupBy('cs.id')
-            ->orderBy('cs.class_section_name', 'ASC')
-            ->get()
-            ->getResultArray();
-
-        $builder = $this->db->table('students s');
-        $builder->select('
-        s.id as student_id,
-        s.school_id,
-        s.firstname,
-        s.lastname,
-        fall.semester_score as fall_score,
-        spring.semester_score as spring_score');
-        // Also select class section for per-class trophy decision
-        $builder->select('sc.class_section_id as class_section_id');
-        $yearEsc = $this->db->escape($selectedYear);
-        $builder->join('student_class sc', 'sc.student_id = s.id AND sc.school_year = ' . $yearEsc, 'left');
-        $builder->join('classSection cs', 'cs.class_section_id = sc.class_section_id', 'left');
-        $builder->join('semester_scores fall', 'fall.student_id = s.id AND fall.semester = "fall" AND fall.school_year = "' . $selectedYear . '"', 'left');
-        $builder->join('semester_scores spring', 'spring.student_id = s.id AND spring.semester = "spring" AND spring.school_year = "' . $selectedYear . '"', 'left');
-        $builder->where('s.is_active', 1);
-        $builder->groupStart()
-            ->where('cs.class_section_name IS NULL')
-            ->orNotLike('cs.class_section_name', 'KG', 'after')
-            ->groupEnd();
-
-        if (!empty($classSectionId)) {
-            $builder->where('sc.class_section_id', $classSectionId);
-        }
-
-        $builder->groupBy('s.id');
-        $students = $builder->get()->getResultArray();
-
-        // Stats for spring
-        $springStatsQuery = $this->db->table('semester_scores')
-            ->select('AVG(semester_scores.semester_score) as mean, STDDEV(semester_scores.semester_score) as std')
-            ->join('student_class', 'student_class.student_id = semester_scores.student_id')
-            ->join('classSection cs', 'cs.class_section_id = student_class.class_section_id', 'left')
-            ->where('semester_scores.semester', 'spring')
-            ->where('semester_scores.school_year', $selectedYear)
-            ->where('student_class.school_year', $selectedYear)
-            ->groupStart()
-                ->where('cs.class_section_name IS NULL')
-                ->orNotLike('cs.class_section_name', 'KG', 'after')
-                ->groupEnd();
-
-        if (!empty($classSectionId)) {
-            $springStatsQuery->where('student_class.class_section_id', $classSectionId);
-        }
-
-        $springStats = $springStatsQuery->get()->getRow();
-        $mean = floatval($springStats->mean ?? 70);
-        $std = floatval($springStats->std ?? 0);
-
-        $results = [];
-        // Use explicit trophy parameters per new requirements
-        // Trophy threshold: minimum 94.0; allow higher configured value if set
-        $trophyThreshold = max(94.0, (float)($this->targetTrophy ?? 94.0));
-        foreach ($students as $s) {
-            $fallScore = is_numeric($s['fall_score']) ? (float)$s['fall_score'] : null;
-            $springScore = is_numeric($s['spring_score']) ? (float)$s['spring_score'] : null;
-
-            $scoreParts = array_values(array_filter([$fallScore, $springScore], static function ($v) {
-                return $v !== null;
-            }));
-            $finalAvg = !empty($scoreParts) ? round(array_sum($scoreParts) / count($scoreParts), 1) : null;
-
-            // When we already have a spring score, the year is effectively finished for trophy/pass logic.
-            $waitingForSpring = ($fallScore !== null && $springScore === null);
-
-            // Compute required spring score for trophy/pass only if spring is missing.
-            $requiredHigh = $waitingForSpring ? round(2 * $trophyThreshold - $fallScore, 2) : null;
-            $requiredLow = $waitingForSpring ? round(2 * $this->targetLow - $fallScore, 2) : null;
-
-            $zHigh = ($requiredHigh !== null && $std > 0) ? ($requiredHigh - $mean) / $std : null;
-            $zLow = ($requiredLow !== null && $std > 0) ? ($requiredLow - $mean) / $std : null;
-
-            $probHigh = $zHigh !== null ? 1 - self::normalCDF($zHigh) : null;
-            $probLow = $zLow !== null ? self::normalCDF($zLow) : null;
-
-            // Trophy determination: only award when the student's final/available average meets the threshold.
-            $riskHigh = match (true) {
-                $finalAvg !== null && !$waitingForSpring && $finalAvg >= $trophyThreshold => 'Achieved Trophy',
-                $finalAvg !== null && !$waitingForSpring => 'Unreachable',
-                $requiredHigh !== null && $requiredHigh > 100 => 'Unreachable',
-                is_null($probHigh) => 'New student',
-                $probHigh >= 0.66 => 'Low',
-                $probHigh >= 0.33 => 'Medium',
-                default => 'High'
-            };
-
-            // Fail risk
-            $riskLow = match (true) {
-                $finalAvg !== null && !$waitingForSpring && $finalAvg < $this->targetLow => 'High',
-                $finalAvg !== null && !$waitingForSpring => 'Low',
-                $requiredLow !== null && $requiredLow > 100 => 'Unlikely to pass',
-                is_null($probLow) => 'New student',
-                $probLow >= 0.66 => 'High',
-                $probLow >= 0.33 => 'Medium',
-                default => 'Low'
-            };
-
-            if ($finalAvg === null) {
-                $status = 'Undetermined';
-            } elseif ($waitingForSpring) {
-                $status = in_array($riskLow, ['High', 'Unlikely to pass'], true) ? 'May fail' : 'Can pass';
-            } else {
-                $status = $finalAvg >= 60 ? 'Passed' : 'Failed';
-            }
-
-            $results[] = [
-                'student_id' => (int)($s['student_id'] ?? 0),
-                'school_id' => $s['school_id'],
-                'firstname' => $s['firstname'],
-                'lastname' => $s['lastname'],
-                'class_section_id' => $s['class_section_id'] ?? null,
-                'fall_score' => $s['fall_score'] ?? 'N/A',
-                'spring_score' => $s['spring_score'] ?? 'N/A',
-                'final_average' => $finalAvg ?? 'N/A',
-                'required_spring_score' => $requiredHigh ?? 'N/A',
-                'winning_risk' => $riskHigh,
-                'required_spring_to_pass' => $requiredLow ?? 'N/A',
-                'failure_risk' => $riskLow,
-                'status' => $status,
-                'trophy_awarded' => ($riskHigh === 'Achieved Trophy'),
-                'trophy_reason' => ($riskHigh === 'Achieved Trophy') ? 'threshold' : '',
-            ];
-        }
-
-        // If a class section has zero threshold trophies, award trophies to top 3 ranked students
-        $bySection = [];
-        $hasThresholdTrophy = [];
-        foreach ($results as $idx => $row) {
-            $cid = (string)($row['class_section_id'] ?? '');
-            $bySection[$cid][] = $idx;
-            if (($row['trophy_reason'] ?? '') === 'threshold') {
-                $hasThresholdTrophy[$cid] = true;
-            }
-        }
-        foreach ($bySection as $cid => $indices) {
-            if (!empty($hasThresholdTrophy[$cid])) {
-                continue;
-            }
-            $candidates = [];
-            foreach ($indices as $idx) {
-                $val = $results[$idx]['final_average'] ?? null;
-                if (!is_numeric($val)) {
-                    $fall = $results[$idx]['fall_score'] ?? null;
-                    $spring = $results[$idx]['spring_score'] ?? null;
-                    $parts = [];
-                    if (is_numeric($fall)) $parts[] = (float)$fall;
-                    if (is_numeric($spring)) $parts[] = (float)$spring;
-                    if (!empty($parts)) {
-                        $val = array_sum($parts) / count($parts);
-                    }
-                }
-                if (is_numeric($val)) {
-                    $candidates[] = ['idx' => $idx, 'avg' => (float)$val];
-                }
-            }
-            if (empty($candidates)) {
-                continue;
-            }
-            usort($candidates, static fn($a, $b) => $b['avg'] <=> $a['avg']);
-            $top = array_slice($candidates, 0, 3);
-            foreach ($top as $entry) {
-                $i = $entry['idx'];
-                $results[$i]['trophy_awarded'] = true;
-                $results[$i]['trophy_reason'] = 'top3';
-                $results[$i]['winning_risk'] = 'Top 3 Trophy';
-            }
-        }
-
-        // Sort students by final average descending
-        usort($results, function ($a, $b) {
-            return ($b['final_average'] ?? 0) <=> ($a['final_average'] ?? 0);
-        });
-
-        return view('score_analysis/score_prediction', [
-            'students' => $results,
-            'school_year' => $selectedYear,
-            'classSections' => $classSections,
-            'selectedClassSectionId' => $classSectionId,
-            'semester' => $this->semester,
-        ]);
-    }
-
-}
diff --git a/app/Http/Controllers/old/TimeService.php b/app/Http/Controllers/old/TimeService.php
new file mode 100644
index 00000000..15cd02c2
--- /dev/null
+++ b/app/Http/Controllers/old/TimeService.php
@@ -0,0 +1,222 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\PreferencesModel;
+use App\Models\SettingsModel;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\I18n\Time;
+
+class TimeService
+{
+    private string $defaultUserTimezone = 'America/New_York';
+    private string $serverTimezone = 'UTC';
+
+    // Cached per-request user timezone
+    private ?string $cachedUserTz = null;
+
+    /**
+     * Prime detection cache from the Request (optional call, lazy by default).
+     */
+    public function primeFromRequest(?RequestInterface $request = null): void
+    {
+        $this->cachedUserTz = $this->detectUserTimezone($request);
+    }
+
+    /**
+     * Get the resolved user timezone (detect lazily if needed).
+     */
+    public function userTimezone(?RequestInterface $request = null): string
+    {
+        if ($this->cachedUserTz !== null) {
+            return $this->cachedUserTz;
+        }
+
+        $this->cachedUserTz = $this->detectUserTimezone($request);
+        return $this->cachedUserTz;
+    }
+
+    /**
+     * Core detection logic (headers > user pref > settings > school config > default).
+     */
+    public function detectUserTimezone(?RequestInterface $request = null): string
+    {
+        $request = $request ?: service('request');
+
+        // 1) Explicit client header
+        try {
+            $tzHeader = $request->getHeaderLine('X-Timezone')
+                ?: $request->getHeaderLine('Timezone')
+                ?: $request->getHeaderLine('Accept-Timezone')
+                ?: null;
+
+            if ($tzHeader && in_array($tzHeader, timezone_identifiers_list(), true)) {
+                return $tzHeader;
+            }
+        } catch (\Throwable $e) {
+            // ignore
+        }
+
+        // 2) User preference (if logged-in)
+        try {
+            $userId = (int) (session('user_id') ?: 0);
+            if ($userId > 0) {
+                // Do not select a specific column; some DBs may not have it yet
+                $pref = (new PreferencesModel())
+                    ->where('user_id', $userId)
+                    ->first();
+                $tz = $pref['timezone'] ?? null;
+                if ($tz && in_array($tz, timezone_identifiers_list(), true)) {
+                    return $tz;
+                }
+            }
+        } catch (\Throwable $e) {
+            // ignore
+        }
+
+        // 3) Global settings timezone (if available)
+        try {
+            $settings = (new SettingsModel())->getSettings();
+            $tz = $settings['timezone'] ?? null;
+            if ($tz && in_array($tz, timezone_identifiers_list(), true)) {
+                return $tz;
+            }
+        } catch (\Throwable $e) {
+            // ignore
+        }
+
+        // 4) School attendance timezone (if defined)
+        try {
+            $tz = (string) (config('School')->attendance['timezone'] ?? '');
+            if ($tz && in_array($tz, timezone_identifiers_list(), true)) {
+                return $tz;
+            }
+        } catch (\Throwable $e) {
+            // ignore
+        }
+
+        // 5) Default
+        return $this->defaultUserTimezone;
+    }
+
+    /**
+     * Server timezone (for storage/UTC operations).
+     */
+    public function serverTimezone(): string
+    {
+        return $this->serverTimezone;
+    }
+
+    /**
+     * Current time in user timezone as CI Time.
+     */
+    public function nowLocal(?string $tz = null): Time
+    {
+        $tz = $tz ?: $this->userTimezone();
+        return Time::now($tz);
+    }
+
+    /**
+     * Current time in UTC as CI Time.
+     */
+    public function nowUTC(): Time
+    {
+        return Time::now($this->serverTimezone);
+    }
+
+    /**
+     * Convert any supported input to UTC string (Y-m-d H:i:s by default).
+     *
+     * @param string|Time|\DateTimeInterface|null $value
+     */
+    public function toUTC($value, ?string $fromTz = null, string $format = 'Y-m-d H:i:s'): ?string
+    {
+        if ($value === null || $value === '') {
+            return null;
+        }
+
+        $fromTz = $fromTz ?: $this->userTimezone();
+
+        try {
+            if ($value instanceof Time) {
+                return $value->setTimezone($this->serverTimezone)->toDateTimeString();
+            }
+            if ($value instanceof \DateTimeInterface) {
+                return Time::createFromInstance($value)
+                    ->setTimezone($this->serverTimezone)
+                    ->format($format);
+            }
+
+            // assume string
+            return Time::parse((string)$value, $fromTz)
+                ->setTimezone($this->serverTimezone)
+                ->format($format);
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+    /**
+     * Convert UTC (or provided timezone) to user-local string.
+     *
+     * @param string|Time|\DateTimeInterface|null $value
+     */
+    public function toLocal($value, ?string $sourceTz = null, ?string $targetTz = null, string $format = 'Y-m-d H:i:s'): ?string
+    {
+        if ($value === null || $value === '') {
+            return null;
+        }
+
+        $targetTz = $targetTz ?: $this->userTimezone();
+        if ($sourceTz === null && $this->isDateOnlyString($value)) {
+            // Date-only strings should not shift across timezones.
+            $sourceTz = $targetTz;
+        } else {
+            $sourceTz = $sourceTz ?: $this->serverTimezone;
+        }
+
+        try {
+            if ($value instanceof Time) {
+                return $value->setTimezone($targetTz)->format($format);
+            }
+            if ($value instanceof \DateTimeInterface) {
+                return Time::createFromInstance($value)
+                    ->setTimezone($targetTz)
+                    ->format($format);
+            }
+
+            // assume string
+            return Time::parse((string)$value, $sourceTz)
+                ->setTimezone($targetTz)
+                ->format($format);
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+    /**
+     * Convenience formatter for user-local.
+     */
+    public function formatLocal($value, string $format = 'Y-m-d H:i', ?string $sourceTz = null): string
+    {
+        return (string) ($this->toLocal($value, $sourceTz, null, $format) ?? '');
+    }
+
+    /**
+     * Convenience formatter for UTC.
+     */
+    public function formatUTC($value, string $format = 'Y-m-d H:i:s', ?string $fromTz = null): string
+    {
+        return (string) ($this->toUTC($value, $fromTz, $format) ?? '');
+    }
+
+    private function isDateOnlyString($value): bool
+    {
+        if (!is_string($value)) {
+            return false;
+        }
+
+        $value = trim($value);
+        return (bool) preg_match('/^\d{4}-\d{2}-\d{2}$/', $value);
+    }
+}
diff --git a/app/Http/Controllers/old/UserController.php b/app/Http/Controllers/old/UserController.php
deleted file mode 100644
index f8d1c6fb..00000000
--- a/app/Http/Controllers/old/UserController.php
+++ /dev/null
@@ -1,874 +0,0 @@
-<?php
-
-namespace App\Controllers\View;
-
-use CodeIgniter\Events\Events;
-use App\Controllers\BaseController;
-use App\Models\UserModel;  // Assuming you have a UserModel
-use App\Models\PasswordResetModel; // Model for the password_resets table
-use CodeIgniter\I18n\Time;
-use App\Models\RoleModel;
-use App\Models\UserRoleModel;
-use App\Models\PasswordResetRequestModel;
-use App\Models\RolePermissionModel;
-use App\Models\IpAttemptModel;
-use CodeIgniter\Controller;
-use App\Controllers\View\EmailController;
-use App\Models\LoginActivityModel; // Make sure this import is present
-require_once APPPATH . 'Helpers/pbkdf2_helper.php';
-
-
-
-class UserController extends BaseController
-{
-    protected $userModel;
-    protected $roleModel;
-    protected $userRoleModel;
-    protected $db;
-    protected $passwordResetModel;
-    protected $loginActivityModel;
-    protected $resetRequestModel;
-
-    public function __construct()
-    {
-        // Load the database service
-        $this->db = \Config\Database::connect();
-        // Check if the database connection is established
-        if (!$this->db->connect()) {
-            log_message('error', 'Database connection failed.');
-            throw new \Exception('Database connection failed.');
-        } else {
-            log_message('info', 'Database connection successful.');
-        }
-        helper('auth');
-        $this->userModel = new UserModel();
-        $this->roleModel = new RoleModel();
-        $this->userRoleModel = new UserRoleModel();
-        $this->passwordResetModel = new PasswordResetModel();
-        $this->loginActivityModel = new LoginActivityModel();
-        $this->resetRequestModel = new PasswordResetRequestModel();
-    }
-
-    // Method to show the home page
-    public function home()
-    {
-        return view('/index');
-    }
-
-    // Method to show the about page
-    public function about()
-    {
-        return view('/about');
-    }
-
-    // Method to show the classes page
-    public function classes()
-    {
-        return view('/classes');
-    }
-
-    // Method to show the contact page
-    public function contact()
-    {
-        return view('/contact');
-    }
-
-    public function userList()
-    {
-        helper('url');
-
-        return view('user/user_list', [
-            'userListEndpoint' => site_url('api/users'),
-        ]);
-    }
-
-    // Method to show the list of users   
-    public function index()
-    {
-        // Fetch users along with their assigned roles
-        $builder = $this->db->table('users');
-        $builder->select('users.id, users.firstname, users.lastname, users.email, user_roles.role_id, roles.name as role, users.status, users.updated_at');
-        $builder->join('user_roles', 'users.id = user_roles.user_id', 'left');
-        $builder->join('roles', 'user_roles.role_id = roles.id', 'left');
-
-        $sort = $this->request->getGet('sort');
-        $order = $this->request->getGet('order') === 'desc' ? 'desc' : 'asc';
-
-        // Define allowed fields for sorting
-        $allowedFields = ['id', 'firstname', 'lastname', 'email', 'role'];
-
-        if (in_array($sort, $allowedFields)) {
-            $sort_column = $sort === 'role' ? 'roles.name' : 'users.' . $sort;
-            $builder->orderBy($sort_column, $order);
-        } else {
-            $builder->orderBy('users.id', 'asc');
-        }
-
-        $query = $builder->get();
-        $users = $query->getResultArray();
-
-        // Fetch available roles
-        $roleBuilder = $this->db->table('roles');
-        $roleQuery = $roleBuilder->get();
-        $roles = $roleQuery->getResultArray();
-
-        return view('user/user_list', [
-            'users' => $users,
-            'roles' => $roles,
-            'sort' => $sort,
-            'order' => $order,
-        ]);
-    }
-
-    public function userListData()
-    {
-        return $this->response->setJSON([
-            'users' => $this->buildUsersWithRoles(),
-        ]);
-    }
-
-    private function buildUsersWithRoles(): array
-    {
-        // Fetch all users
-        $users = $this->userModel->findAll();
-        if (!is_array($users)) {
-            return [];
-        }
-
-        // Aggregate guardian types (primary/secondary) by user_id
-        $gmap = [];
-        try {
-            $rows = $this->db->table('family_guardians')
-                ->select('user_id, MAX(is_primary) AS max_primary, COUNT(*) AS cnt', false)
-                ->groupBy('user_id')
-                ->get()->getResultArray();
-            foreach ($rows as $r) {
-                $uid = (int)($r['user_id'] ?? 0);
-                if ($uid <= 0) continue;
-                $maxp = (int)($r['max_primary'] ?? 0);
-                $cnt  = (int)($r['cnt'] ?? 0);
-                if ($cnt > 0) {
-                    $gmap[$uid] = $maxp > 0 ? 'Primary' : 'Secondary';
-                }
-            }
-        } catch (\Throwable $e) {
-            // ignore if table missing; leave map empty
-        }
-
-        // Aggregate "second parent presence" from legacy parents table
-        $secondByUserId = [];
-        $secondByEmail  = [];
-        try {
-            $parentFields = $this->db->getFieldNames('parents');
-            $hasSecondUid   = in_array('secondparent_user_id', $parentFields, true);
-            $hasSecondEmail = in_array('secondparent_email', $parentFields, true);
-
-            if ($hasSecondUid) {
-                // Map: user_id present in parents.secondparent_user_id
-                $uidRows = $this->db->table('parents')
-                    ->select('secondparent_user_id AS uid, COUNT(*) AS cnt', false)
-                    ->where('secondparent_user_id !=', 0)
-                    ->groupBy('secondparent_user_id')
-                    ->get()->getResultArray();
-                foreach ($uidRows as $r) {
-                    $u = (int)($r['uid'] ?? 0);
-                    if ($u > 0) {
-                        $secondByUserId[$u] = true;
-                    }
-                }
-            }
-
-            if ($hasSecondEmail) {
-                // Map: email present in parents.secondparent_email
-                $emailRows = $this->db->table('parents')
-                    ->select('LOWER(TRIM(secondparent_email)) AS em, COUNT(*) AS cnt', false)
-                    ->where('secondparent_email !=', '')
-                    ->groupBy('secondparent_email')
-                    ->get()->getResultArray();
-                foreach ($emailRows as $r) {
-                    $em = trim(strtolower((string)($r['em'] ?? '')));
-                    if ($em !== '') {
-                        $secondByEmail[$em] = true;
-                    }
-                }
-            }
-        } catch (\Throwable $e) {
-            // ignore if legacy table or fields are missing
-        }
-
-        // Prepare an array to store user data along with their roles
-        $usersWithRoles = [];
-
-        // Loop through each user and get their roles
-        foreach ($users as $user) {
-            if (!is_array($user)) {
-                continue;
-            }
-
-            // Get the user's roles from the user_roles table
-            $userRoles = $this->userRoleModel->where('user_id', $user['id'])->findAll() ?? [];
-
-            // Initialize arrays to hold role names/ids for this user
-            $roleNames = [];
-            $roleIds   = [];
-
-            // Fetch role names from the roles table
-            foreach ($userRoles as $userRole) {
-                if (!is_array($userRole) || empty($userRole['role_id'])) {
-                    continue;
-                }
-                $role = $this->roleModel->find($userRole['role_id']);
-                if ($role) {
-                    $roleIds[]   = (int) $role['id'];
-                    $roleNames[] = $role['name'];
-                }
-            }
-
-            // Parent type if user is a guardian in any family
-            $parentType = $gmap[(int)($user['id'] ?? 0)] ?? '';
-
-            // Second-from-parents flag: by secondparent_user_id or secondparent_email
-            $isSecond = false;
-            $uid = (int)($user['id'] ?? 0);
-            if ($uid > 0 && !empty($secondByUserId[$uid])) {
-                $isSecond = true;
-            } else {
-                $em = trim(strtolower((string)($user['email'] ?? '')));
-                if ($em !== '' && !empty($secondByEmail[$em])) $isSecond = true;
-            }
-
-            // Add the user data along with role names to the result array
-            $usersWithRoles[] = [
-                'user'         => $user,
-                'roles'        => $roleNames,
-                'role_ids'     => $roleIds,
-                'parent_type'  => $parentType, // 'Primary', 'Secondary', or ''
-                'second_from_parents' => $isSecond ? 'Yes' : '',
-            ];
-        }
-
-        return $usersWithRoles;
-    }
-
-    // Method to store a new user
-    public function store()
-    {
-        // Validate input data
-        $validation = \Config\Services::validation();
-        $validation->setRules([
-            'username' => 'required',
-            'password' => 'required|min_length[6]',
-            'lastname' => 'required',
-            'firstname' => 'required',
-            'cellphone' => 'required',
-            'email' => 'required|valid_email',
-            'address_street' => 'required',
-            'city' => 'required',
-            'state' => 'required',
-            'zip' => 'required',
-            'accept_school_policy' => 'required',
-            'role_id' => 'required|integer'
-        ]);
-
-        if (!$this->validate($validation->getRules())) {
-            $errors = $validation->getErrors();
-            return redirect()->back()->withInput()->with('errors', $errors);
-        }
-
-        // Prepare user data for insertion
-        $userData = [
-            'username' => $this->request->getPost('username'),
-            'password' => pbkdf2_hash($this->request->getPost('password')),
-            'lastname' => ucfirst($this->request->getPost('lastname')),
-            'firstname' => ucfirst($this->request->getPost('firstname')),
-            'cellphone' => $this->request->getPost('cellphone'),
-            'email' => strtolower($this->request->getPost('email')),
-            'address_street' => $this->request->getPost('address_street'),
-            'city' => ucfirst($this->request->getPost('city')),
-            'state' => $this->request->getPost('state'),
-            'zip' => $this->request->getPost('zip'),
-            'accept_school_policy' => $this->request->getPost('accept_school_policy'),
-        ];
-
-        // Insert user data into the database
-        if ($this->userModel->save($userData) === false) {
-            return redirect()->back()->withInput()->with('errors', $this->userModel->errors());
-        }
-
-        // Retrieve the newly created user ID
-        $userId = $this->userModel->getInsertID();
-
-        // Assign the role to the user in the user_roles table
-        $roleData = [
-            'user_id' => $userId,
-            'role_id' => $this->request->getPost('role_id'),
-            'created_at' => utc_now(),
-        ];
-
-        if ($this->userRoleModel->save($roleData) === false) {
-            return redirect()->back()->withInput()->with('errors', $this->userRoleModel->errors());
-        }
-
-        return redirect()->to('/user');
-    }
-
-    // Method to show the form for editing an existing user
-    public function edit($id)
-    {
-        $data['user'] = $this->userModel->find($id);
-        $data['roles'] = $this->roleModel->findAll();
-        $userRoles = $this->userRoleModel->where('user_id', $id)->findAll();
-        $data['assignedRoles'] = array_column($userRoles, 'role_id');
-
-        return view('user/edit', $data);
-    }
-
-
-    // Method to delete an existing user
-    public function delete($id)
-    {
-        $this->userModel->delete($id);
-
-        // Delete the user's roles from the user_roles table
-        $this->userRoleModel->where('user_id', $id)->delete();
-
-        return redirect()->to('/user');
-    }
-
-
-    //This function is necessary to display the initial forgot password form where the user enters their email address.
-    public function forgotPassword()
-    {
-        return view('/user/forgot_password');
-    }
-
-    //This function is crucial for processing the forgot password request, generating a reset token, storing it in the database, and sending an email with the reset link.
-    public function processForgotPassword()
-    {
-        log_message('debug', 'Entered processForgotPassword');
-
-        $ip = $this->request->getIPAddress();
-
-        $recentAttempts = $this->resetRequestModel
-            ->where('ip_address', $ip)
-            ->where('requested_at >=', Time::now()->subHours(24)->toDateTimeString())
-            ->countAllResults();
-
-        if ($recentAttempts >= 3) {
-            log_message('warning', "IP {$ip} blocked due to too many reset attempts.");
-            session()->setFlashdata('show_block_modal', true);
-            return redirect()->back();
-        }
-
-        // Log this attempt
-        $this->resetRequestModel->insert([
-            'ip_address'   => $ip,
-            'requested_at' => Time::now(),
-        ]);
-
-        $email = strtolower($this->request->getPost('email'));
-        $user  = $this->userModel->where('email', $email)->first();
-
-        // --- Handle unknown email ---
-        if (!$user) {
-            session()->setFlashdata('error', 'If this email is registered, you will receive a reset link.');
-            log_message('info', "Password reset requested for non-existing user {$email}");
-            return redirect()->back();
-        }
-
-        // --- Handle unverified accounts ---
-        if ((int) $user['is_verified'] === 0) {
-            session()->setFlashdata('error', 'Please check your email and complete the account activation process before resetting your password.');
-            log_message('info', "Password reset blocked for unverified user {$email}");
-            return redirect()->back();
-        }
-
-        // --- Verified user: continue with reset ---
-        $token      = bin2hex(random_bytes(48));
-        $expires_at = Time::now()->addHours(1);
-
-        $this->passwordResetModel->insert([
-            'email'      => $email,
-            'token'      => $token,
-            'created_at' => Time::now(),
-            'expires_at' => $expires_at,
-        ]);
-
-        $this->sendResetEmail($email, $token);
-
-        session()->setFlashdata('success', 'A password reset link has been sent to your email.');
-        log_message('info', "Password reset email sent to {$email}");
-
-        return redirect()->back();
-    }
-
-
-    public function blocked()
-    {
-        session()->setFlashdata('show_block_modal', true);
-        return redirect()->back(); // Show modal on the previous page
-    }
-
-    //This function is needed to display a confirmation page after the reset email has been sent, informing the user to check their email.
-    public function passwordResetConfirmation()
-    {
-        $email = session()->getFlashdata('reset_email');
-
-        return view('user/password_reset_confirmation', ['email' => $email]);
-    }
-
-    //This is a private helper function that handles sending the reset email. It’s separated out to keep the processForgotPassword function clean and focused.
-    public function sendResetEmail($email, $token)
-    {
-        $resetLink = site_url('/reset_password?token=' . $token);
-
-        // Render email template with data
-        $message = view('emails/reset_password', ['resetLink' => $resetLink]);
-
-        $emailController = new EmailController();
-        $subject = 'Password Reset Request';
-
-        if ($emailController->sendEmail($email, $subject, $message)) {
-            log_message('info', 'Password reset email successfully sent to ' . $email);
-        } else {
-            log_message('error', 'Failed to send password reset email to ' . $email);
-        }
-    }
-
-
-    //This function is necessary to display the form where the user can enter a new password, after clicking on the reset link in their email.
-    public function resetPassword()
-    {
-        // Retrieve the token from the query string
-        $token = $this->request->getGet('token');
-
-        if (!$token) {
-            return redirect()->to('/')->with('error', 'Invalid password reset link.');
-        }
-
-        // You may want to validate the token here
-        $resetEntry = $this->passwordResetModel->where('token', $token)
-            ->where('expires_at >=', Time::now())
-            ->first();
-
-        if (!$resetEntry) {
-            return redirect()->to('/')->with('error', 'Invalid or expired reset link.');
-        }
-
-        // Load the reset password view with the token
-        return view('user/reset_password', ['token' => $token]);
-    }
-
-    //This function processes the new password submission, validating the token, updating the user's password, and cleaning up the reset entry.
-    public function processResetPassword()
-    {
-        $token = $this->request->getPost('token');
-        $newPassword = $this->request->getPost('password');
-        $passConfirm = $this->request->getPost('pass_confirm');
-
-        // Validate the input
-        if (!$this->validate([
-            'password' => [
-                'label' => 'Password',
-                'rules' => 'required|min_length[8]|regex_match[/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@\-=\+*#$%&!?])[A-Za-z\d@\-=\+*#$%&!?]{8,}$/]',
-                'errors' => [
-                    'required' => 'Password is required.',
-                    'min_length' => 'Password must be at least 8 characters.',
-                    'regex_match' => 'Password must contain at least one lowercase letter, one uppercase letter, one number, and one special character (@, -, =, +, *, #, $, %, &, !, ?).'
-                ]
-            ],
-            'pass_confirm' => [
-                'label' => 'Confirm Password',
-                'rules' => 'required|matches[password]',
-                'errors' => [
-                    'required' => 'Password confirmation is required.',
-                    'matches' => 'Passwords do not match.'
-                ]
-            ]
-        ])) {
-            return redirect()->back()->withInput()->with('errors', $this->validator->getErrors());
-        }
-
-        // Find the password reset entry
-        $resetEntry = $this->passwordResetModel->where('token', $token)
-            ->where('expires_at >=', Time::now())
-            ->first();
-
-        if (!$resetEntry) {
-            return redirect()->to('/')->with('error', 'Invalid or expired reset link.');
-        }
-
-        // Find the user by email
-        $user = $this->userModel->where('email', $resetEntry['email'])->first();
-
-        if (!$user) {
-            return redirect()->to('/')->with('error', 'User not found.');
-        }
-
-        // 🛠 Hash the password using PBKDF2
-        $hashedPassword = pbkdf2_hash($newPassword);
-
-        // Update the password in the users table and set the account status to 'Active'
-        // Reset failed login attempts, suspension status, and last failed login time
-        $this->userModel->update($user['id'], [
-            'failed_attempts' => 0, // Reset failed attempts
-            'is_suspended'    => 0, // Unsuspend the account
-            'last_failed_at'  => null, // Reset the last failed login timestamp
-            'password' => $hashedPassword,
-            'status' => 'Active'
-        ]);
-
-        // Delete the used token from the password reset table
-        $this->passwordResetModel->where('token', $token)->delete();
-
-        // Retrieve the user's IP address from the request
-        $ipAddress = $this->request->getIPAddress();
-
-        // Delete the corresponding entry from the ip_attempts table, only if it exists
-        $ipAttemptModel = new IpAttemptModel();
-        $existingAttempt = $ipAttemptModel->where('ip_address', $ipAddress)->first();
-
-        if ($existingAttempt) {
-            // IP address entry exists, so delete it
-            $ipAttemptModel->where('ip_address', $ipAddress)->delete();
-        }
-
-        // Redirect to a success page with a success message
-        return view('user/password_set_success');
-    }
-
-
-
-    public function passwordSetSuccess()
-    {
-        return view('user/password_set_success');
-    }
-
-    public function confirm($token)
-    {
-        log_message('info', 'Processing email confirmation with token: ' . $token);
-
-
-        $user = $this->userModel->where('token', $token)->first();
-
-        if (!$user || $user['is_verified'] == 1) {
-            return redirect()->to('/invalid_token');
-        }
-
-
-        // Mark the user as verified and generate an account ID
-        $account_id = 'ACC' . str_pad($user['id'], 8, '0', STR_PAD_LEFT); // Example: ACC00000001
-        $this->userModel->update($user['id'], ['is_verified' => 1, 'token' => null, 'account_id' => $account_id]);
-
-        log_message('info', 'User verified and account ID generated: ' . $account_id);
-
-        // Redirect to the set password page
-        return redirect()->to('/set_password/' . $user['id']);
-    }
-
-    public function setPassword($token)
-    {
-        //echo "Reached setPassword with token: " . esc($token);
-        //echo "Token received: " . $token;
-        $user = $this->userModel->where('token', $token)->first();
-
-        if (!$user || $user['is_verified'] == 1) {
-            return redirect()->to('/invalid_token');
-        }
-
-        return view('user/set_password', [
-            'userId' => $user['id'],
-            'token' => $token
-        ]);
-    }
-
-    public function savePassword()
-    {
-        $validation = \Config\Services::validation();
-        $validation->setRules([
-            'password' => [
-                'label' => 'Password',
-                'rules' => 'required|min_length[8]|regex_match[/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@\-=\+*#$%&!?])[A-Za-z\d@\-=\+*#$%&!?]{8,}$/]',
-                'errors' => [
-                    'required' => 'Password is required.',
-                    'min_length' => 'Password must be at least 8 characters long.',
-                    'regex_match' => 'Password must contain at least one lowercase letter, one uppercase letter, one number, and one special character (@, -, =, +, *, #, $, %, &, !, ?).'
-                ]
-            ],
-            'password_confirm' => [
-                'label' => 'Confirm Password',
-                'rules' => 'required|matches[password]',
-                'errors' => [
-                    'required' => 'Password confirmation is required.',
-                    'matches' => 'Passwords do not match.'
-                ]
-            ],
-            'user_id' => 'required|integer',
-            'token' => 'required'
-        ]);
-
-        if (!$this->validate($validation->getRules())) {
-            return redirect()->back()->withInput()->with('errors', $validation->getErrors());
-        }
-
-        $userId = $this->request->getPost('user_id');
-        $token  = $this->request->getPost('token');
-        $password = $this->request->getPost('password');
-
-        $user = $this->userModel->where('id', $userId)->where('token', $token)->first();
-
-        log_message('debug', "Attempting to set password for user $userId with token $token");
-
-        if (!$user || $user['is_verified'] == 1) {
-            return redirect()->to('/invalid_token');
-        }
-
-        $hashedPassword = pbkdf2_hash($password); // Or use password_hash()
-
-        // Generate account_id only if it's not already set
-        $account_id = $user['account_id'] ?? null;
-        if (!$account_id) {
-            $account_id = 'ACC' . str_pad($userId, 8, '0', STR_PAD_LEFT);
-        }
-
-        $this->userModel->update($userId, [
-            'password'     => $hashedPassword,
-            'status'       => 'Active',
-            'is_verified'  => 1,
-            'token'        => null,
-            'account_id'   => $account_id,
-        ]);
-
-        // Optional: trigger event
-        $userData = $this->userModel->getUserInfoById($userId);
-        if (!is_array($userData)) {
-            $userData = (array) $userData;
-        }
-        $userData['id'] = $userId;
-        \CodeIgniter\Events\Events::trigger('user_registered', $userData);
-
-        return redirect()->to('/user/password_set_success');
-    }
-
-
-
-    public function invalidToken()
-    {
-        return view('errors/invalid_token');
-    }
-
-
-    public function selectRole()
-    {
-        log_message('info', 'Processing setRole form submission.');
-
-        if (!session()->get('is_logged_in')) {
-            log_message('error', 'User is not logged in.');
-            return redirect()->to('/user/login');
-        }
-
-        $roleKey = (string) $this->request->getPost('role');
-        log_message('info', 'Role selected: ' . $roleKey);
-
-        $roleModel = new RoleModel();
-        $route = $roleModel->getRouteByNameOrSlug($roleKey);
-
-        if ($route === null) {
-            log_message('error', 'Invalid or inactive role selected: ' . $roleKey);
-            return redirect()->back()->with('error', 'Invalid role selected.');
-        }
-
-        $userId = (int) session()->get('user_id');
-        log_message('info', 'User ID: ' . $userId);
-
-        // Persist the *exact* role name or slug—choose your convention.
-        // If you want to store the canonical name, fetch the row and use $row['name'].
-        $this->userModel->update($userId, ['role' => $roleKey]);
-        log_message('info', 'Role updated in database.');
-
-        log_message('info', 'Redirecting to role dashboard: ' . $route);
-        return redirect()->to($route);
-    }
-
-
-    public function welcomeBack()
-    {
-        if (!session()->get('is_logged_in')) {
-            return redirect()->to('/user/login');
-        }
-
-        return view('user/welcome_back');
-    }
-
-    public function delete_role($roleId)
-    {
-        // Fetch the role to be deleted
-        $role = $this->roleModel->find($roleId);
-        if (!$role) {
-            return redirect()->back()->with('error', 'Role not found.');
-        }
-
-        // Fetch the "Guest" role
-        $guestRole = $this->roleModel->where('name', 'Guest')->first();
-        if (!$guestRole) {
-            return redirect()->back()->with('error', 'Guest role not found.');
-        }
-
-        // Update users with the deleted role to have the "Guest" role
-        $this->userModel->where('role_id', $roleId)->set(['role_id' => $guestRole['id'], 'role' => 'Guest', 'status' => 'Inactive'])->update();
-
-        // Verify that users have been updated
-        $updatedUsers = $this->userModel->where('role_id', $guestRole['id'])->findAll();
-        log_message('debug', 'Updated users: ' . print_r($updatedUsers, true));
-
-        // Delete the role
-        if ($this->roleModel->delete($roleId)) {
-            return redirect()->to('/administrator/user_roles')->with('success', 'Role deleted successfully. Users with this role have been assigned the Guest role.');
-        } else {
-            return redirect()->back()->with('error', 'Failed to delete role.');
-        }
-    }
-
-    public function loginActivity()
-    {
-        helper('url');
-
-        $perPage = (int) ($this->request->getGet('per_page') ?? 25);
-
-        return view('user/login_activity', [
-            'loginActivityEndpoint' => site_url('api/login-activity'),
-            'defaultPerPage'        => $perPage > 0 ? $perPage : 25,
-        ]);
-    }
-
-    public function loginActivityData()
-    {
-        $perPage = (int) ($this->request->getGet('per_page') ?? 25);
-        $page    = (int) ($this->request->getGet('page') ?? 1);
-
-        return $this->response->setJSON($this->buildLoginActivityPayload($perPage, $page));
-    }
-
-    // Method to update an existing user
-    public function updateUser()
-    {
-        if (strtolower($this->request->getMethod()) !== 'post') {
-            return redirect()->to(site_url('user/user_list'))->with('error', 'Invalid request.');
-        }
-
-        $id = (int) $this->request->getPost('id');
-        if (!$id) {
-            return redirect()->to(site_url('user/user_list'))->with('error', 'User ID is missing.');
-        }
-
-        $user = $this->userModel->find($id);
-        if (!$user) {
-            return redirect()->to(site_url('user/user_list'))->with('error', 'User not found.');
-        }
-
-        // Helpers
-        $toBool = fn($k) => $this->request->getPost($k) ? 1 : 0;
-        $toDT   = function ($key) {
-            $v = trim((string)$this->request->getPost($key));
-            if ($v === '') return null;
-            // Expecting HTML datetime-local "YYYY-MM-DDTHH:MM"
-            $ts = strtotime($v);
-            return $ts ? date('Y-m-d H:i:s', $ts) : null;
-        };
-
-        $data = [
-            'id'                   => $id,
-            'account_id'           => trim((string)$this->request->getPost('account_id')),
-            'lastname'             => trim((string)$this->request->getPost('lastname')),
-            'firstname'            => trim((string)$this->request->getPost('firstname')),
-            'gender'               => trim((string)$this->request->getPost('gender')),
-            'cellphone'            => trim((string)$this->request->getPost('cellphone')),
-            'email'                => trim((string)$this->request->getPost('email')),
-            'address_street'       => trim((string)$this->request->getPost('address_street')),
-            'apt'                  => trim((string)$this->request->getPost('apt')),
-            'city'                 => trim((string)$this->request->getPost('city')),
-            'state'                => trim((string)$this->request->getPost('state')),
-            'zip'                  => trim((string)$this->request->getPost('zip')),
-            'accept_school_policy' => $toBool('accept_school_policy'),
-            'user_type'            => trim((string)$this->request->getPost('user_type')),
-            'rfid_tag'             => trim((string)$this->request->getPost('rfid_tag')),
-            'school_id'            => trim((string)$this->request->getPost('school_id')),
-            'failed_attempts'      => (string)$this->request->getPost('failed_attempts') === '' ? null : (int)$this->request->getPost('failed_attempts'),
-            'last_failed_at'       => $toDT('last_failed_at'),
-            'semester'             => trim((string)$this->request->getPost('semester')),
-            'school_year'          => trim((string)$this->request->getPost('school_year')),
-            'status'               => trim((string)$this->request->getPost('status')),
-            'is_suspended'         => $toBool('is_suspended'),
-            'is_verified'          => $toBool('is_verified'),
-            'token'                => trim((string)$this->request->getPost('token')),
-            'updated_at'           => $toDT('updated_at'),
-            'created_at'           => $toDT('created_at'),
-        ];
-
-        // Validation
-        $rules = [
-            'firstname' => 'required|min_length[2]|max_length[100]',
-            'lastname'  => 'required|min_length[2]|max_length[100]',
-            'email'     => "required|valid_email|is_unique[users.email,id,{$id}]",
-            'state'     => 'permit_empty|max_length[2]',
-            'zip'       => 'permit_empty|max_length[20]',
-            'cellphone' => 'permit_empty|max_length[50]',
-            'failed_attempts' => 'permit_empty|integer',
-            'gender'    => 'permit_empty|in_list[male,female,MALE,FEMALE]', // adjust as needed
-        ];
-
-        if (!$this->validate($rules)) {
-            return redirect()->back()
-                ->with('error', implode(' ', $this->validator->getErrors()))
-                ->withInput();
-        }
-
-        if (!$this->userModel->save($data)) {
-            return redirect()->back()->with('error', 'Failed to update user.')->withInput();
-        }
-
-        return redirect()->to(site_url('user/user_list'))->with('success', 'User updated successfully.');
-    }
-
-    private function buildLoginActivityPayload(int $perPage, int $page): array
-    {
-        $perPage = max(1, min($perPage, 200));
-        $page    = max(1, $page);
-
-        $totalActivities = (int) $this->loginActivityModel->countAll();
-        $activities = $this->loginActivityModel
-            ->orderBy('login_time', 'DESC')
-            ->paginate($perPage, 'loginActivity', $page) ?? [];
-
-        $pager = $this->loginActivityModel->pager;
-        $currentPage = $pager ? (int) $pager->getCurrentPage('loginActivity') : $page;
-        $pageCount = $pager ? (int) $pager->getPageCount('loginActivity') : (int) max(1, ceil($totalActivities / $perPage));
-
-        $normalized = array_map(static function ($activity) {
-            if (!is_array($activity)) {
-                return [];
-            }
-
-            return [
-                'user_id'     => $activity['user_id'] ?? null,
-                'email'       => $activity['email'] ?? null,
-                'login_time'  => $activity['login_time'] ?? null,
-                'logout_time' => $activity['logout_time'] ?? null,
-                'ip_address'  => $activity['ip_address'] ?? null,
-                'user_agent'  => $activity['user_agent'] ?? null,
-            ];
-        }, $activities);
-
-        return [
-            'activities' => $normalized,
-            'pagination' => [
-                'total'       => $totalActivities,
-                'perPage'     => $perPage,
-                'currentPage' => $currentPage,
-                'pageCount'   => $pageCount,
-                'hasNext'     => $currentPage < $pageCount,
-                'hasPrevious' => $currentPage > 1,
-            ],
-        ];
-    }
-}
diff --git a/app/Http/Requests/ApiFormRequest.php b/app/Http/Requests/ApiFormRequest.php
index afb6d217..b1266d21 100644
--- a/app/Http/Requests/ApiFormRequest.php
+++ b/app/Http/Requests/ApiFormRequest.php
@@ -8,6 +8,29 @@ use Illuminate\Http\Exceptions\HttpResponseException;
 
 abstract class ApiFormRequest extends FormRequest
 {
+    public function validationData(): array
+    {
+        $json = json_decode($this->getContent() ?: '', true);
+        $json = is_array($json) ? $json : [];
+
+        return array_merge(
+            $this->query->all(),
+            $this->request->all(),
+            $this->json()->all(),
+            $json
+        );
+    }
+
+    protected function prepareForValidation(): void
+    {
+        $json = json_decode($this->getContent() ?: '', true);
+        if (is_array($json)) {
+            $this->merge($json);
+        } else {
+            $this->merge($this->json()->all());
+        }
+    }
+
     protected function failedValidation(Validator $validator): void
     {
         throw new HttpResponseException(
diff --git a/app/Http/Requests/Auth/RegisterRequest.php b/app/Http/Requests/Auth/RegisterRequest.php
new file mode 100644
index 00000000..13401f00
--- /dev/null
+++ b/app/Http/Requests/Auth/RegisterRequest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Requests\Auth;
+
+use App\Http\Requests\ApiFormRequest;
+
+class RegisterRequest extends ApiFormRequest
+{
+    public static function ruleset(): array
+    {
+        return (new self())->rules();
+    }
+
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'firstname' => ['required', 'regex:/^[a-zA-Z\s-]+$/', 'min:2', 'max:30'],
+            'lastname' => ['required', 'regex:/^[a-zA-Z\s-]+$/', 'min:2', 'max:30'],
+            'gender' => ['required', 'in:Male,Female'],
+            'email' => ['required', 'email', 'max:50'],
+            'confirm_email' => ['required', 'same:email'],
+            'cellphone' => ['required', 'regex:/^[\d\s\-\(\)\.]+$/', 'min:10', 'max:20'],
+            'address_street' => ['nullable', 'regex:/^[a-zA-Z0-9\s\-]+$/', 'max:150'],
+            'apt' => ['nullable', 'regex:/^[a-zA-Z0-9\s-]+$/', 'max:10'],
+            'city' => ['required', 'regex:/^[a-zA-Z\s]+$/', 'min:2', 'max:30'],
+            'state' => ['required', 'in:CT,ME,MA,NH,NY,RI,VT'],
+            'zip' => ['required', 'regex:/^\d{5}$/'],
+            'accept_school_policy' => ['required'],
+            'captcha' => ['required', 'alpha_num', 'min:4', 'max:10'],
+            'is_parent' => ['nullable', 'boolean'],
+            'no_second_parent_info' => ['nullable', 'boolean'],
+            'second_firstname' => ['exclude_if:no_second_parent_info,1', 'required_if:is_parent,1', 'regex:/^[a-zA-Z\s\-]+$/', 'min:2', 'max:30'],
+            'second_lastname' => ['exclude_if:no_second_parent_info,1', 'required_if:is_parent,1', 'regex:/^[a-zA-Z\s\-]+$/', 'min:2', 'max:30'],
+            'second_gender' => ['exclude_if:no_second_parent_info,1', 'required_if:is_parent,1', 'in:Male,Female'],
+            'second_email' => ['exclude_if:no_second_parent_info,1', 'required_if:is_parent,1', 'email', 'max:50'],
+            'second_cellphone' => ['exclude_if:no_second_parent_info,1', 'required_if:is_parent,1', 'regex:/^[\d\s\-\(\)\.]+$/', 'min:10', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Discounts/ApplyDiscountVoucherRequest.php b/app/Http/Requests/Discounts/ApplyDiscountVoucherRequest.php
new file mode 100644
index 00000000..837eb514
--- /dev/null
+++ b/app/Http/Requests/Discounts/ApplyDiscountVoucherRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Discounts;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ApplyDiscountVoucherRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'voucher_id' => ['required', 'integer', 'min:1', 'exists:discount_vouchers,id'],
+            'parent_ids' => ['required', 'array', 'min:1'],
+            'parent_ids.*' => ['integer', 'min:1'],
+            'allow_additional' => ['nullable', 'boolean'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Discounts/StoreDiscountVoucherRequest.php b/app/Http/Requests/Discounts/StoreDiscountVoucherRequest.php
new file mode 100644
index 00000000..ce6f1326
--- /dev/null
+++ b/app/Http/Requests/Discounts/StoreDiscountVoucherRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Discounts;
+
+use App\Http\Requests\ApiFormRequest;
+
+class StoreDiscountVoucherRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'code' => ['required', 'string', 'max:50'],
+            'discount_type' => ['required', 'in:percent,fixed'],
+            'discount_value' => ['required', 'numeric', 'min:0'],
+            'max_uses' => ['nullable', 'integer', 'min:0'],
+            'valid_from' => ['nullable', 'date_format:Y-m-d'],
+            'valid_until' => ['nullable', 'date_format:Y-m-d', 'after_or_equal:valid_from'],
+            'is_active' => ['nullable', 'boolean'],
+            'description' => ['nullable', 'string'],
+            'school_year' => ['nullable', 'string'],
+            'semester' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Discounts/UpdateDiscountVoucherRequest.php b/app/Http/Requests/Discounts/UpdateDiscountVoucherRequest.php
new file mode 100644
index 00000000..42aeab3d
--- /dev/null
+++ b/app/Http/Requests/Discounts/UpdateDiscountVoucherRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Discounts;
+
+use App\Http\Requests\ApiFormRequest;
+
+class UpdateDiscountVoucherRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'code' => ['sometimes', 'string', 'max:50'],
+            'discount_type' => ['sometimes', 'in:percent,fixed'],
+            'discount_value' => ['sometimes', 'numeric', 'min:0'],
+            'max_uses' => ['nullable', 'integer', 'min:0'],
+            'valid_from' => ['nullable', 'date_format:Y-m-d'],
+            'valid_until' => ['nullable', 'date_format:Y-m-d', 'after_or_equal:valid_from'],
+            'is_active' => ['nullable', 'boolean'],
+            'description' => ['nullable', 'string'],
+            'school_year' => ['nullable', 'string'],
+            'semester' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Expenses/StoreExpenseRequest.php b/app/Http/Requests/Expenses/StoreExpenseRequest.php
new file mode 100644
index 00000000..d3d4e6bb
--- /dev/null
+++ b/app/Http/Requests/Expenses/StoreExpenseRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Expenses;
+
+use App\Http\Requests\ApiFormRequest;
+
+class StoreExpenseRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'category' => ['required', 'in:Expense,Purchase,Reimbursement,Donation'],
+            'amount' => ['required', 'numeric', 'gt:0'],
+            'purchased_by' => ['required', 'integer', 'min:1'],
+            'retailor' => ['nullable', 'string', 'max:255'],
+            'date_of_purchase' => ['required', 'date_format:Y-m-d'],
+            'description' => ['nullable', 'string'],
+            'receipt' => ['required', 'file', 'max:2048', 'mimes:jpg,jpeg,png,webp,gif,pdf'],
+            'school_year' => ['nullable', 'string'],
+            'semester' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Expenses/UpdateExpenseRequest.php b/app/Http/Requests/Expenses/UpdateExpenseRequest.php
new file mode 100644
index 00000000..9ed32e3d
--- /dev/null
+++ b/app/Http/Requests/Expenses/UpdateExpenseRequest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Requests\Expenses;
+
+use App\Http\Requests\ApiFormRequest;
+
+class UpdateExpenseRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'category' => ['required', 'in:Expense,Purchase,Reimbursement,Donation'],
+            'amount' => ['required', 'numeric', 'gt:0'],
+            'purchased_by' => ['required', 'integer', 'min:1'],
+            'retailor' => ['nullable', 'string', 'max:255'],
+            'date_of_purchase' => ['required', 'date_format:Y-m-d'],
+            'description' => ['nullable', 'string'],
+            'receipt' => ['nullable', 'file', 'max:2048', 'mimes:jpg,jpeg,png,webp,gif,pdf'],
+            'remove_receipt' => ['nullable', 'boolean'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Expenses/UpdateExpenseStatusRequest.php b/app/Http/Requests/Expenses/UpdateExpenseStatusRequest.php
new file mode 100644
index 00000000..88f95d17
--- /dev/null
+++ b/app/Http/Requests/Expenses/UpdateExpenseStatusRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Expenses;
+
+use App\Http\Requests\ApiFormRequest;
+
+class UpdateExpenseStatusRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'status' => ['required', 'in:approved,denied'],
+            'reason' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/ExtraCharges/StoreExtraChargeRequest.php b/app/Http/Requests/ExtraCharges/StoreExtraChargeRequest.php
new file mode 100644
index 00000000..cd3eca62
--- /dev/null
+++ b/app/Http/Requests/ExtraCharges/StoreExtraChargeRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\ExtraCharges;
+
+use App\Http\Requests\ApiFormRequest;
+
+class StoreExtraChargeRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'parent_id' => ['required', 'integer', 'min:1'],
+            'title' => ['required', 'string', 'min:2'],
+            'amount' => ['required', 'numeric'],
+            'charge_type' => ['required', 'in:add,deduct'],
+            'due_date' => ['nullable', 'date_format:Y-m-d'],
+            'invoice_id' => ['nullable', 'integer', 'min:1'],
+            'description' => ['nullable', 'string'],
+            'school_year' => ['nullable', 'string'],
+            'semester' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/ExtraCharges/UpdateExtraChargeRequest.php b/app/Http/Requests/ExtraCharges/UpdateExtraChargeRequest.php
new file mode 100644
index 00000000..0d58618b
--- /dev/null
+++ b/app/Http/Requests/ExtraCharges/UpdateExtraChargeRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\ExtraCharges;
+
+use App\Http\Requests\ApiFormRequest;
+
+class UpdateExtraChargeRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'title' => ['required', 'string', 'min:2'],
+            'amount' => ['required', 'numeric'],
+            'charge_type' => ['required', 'in:add,deduct'],
+            'due_date' => ['nullable', 'date_format:Y-m-d'],
+            'description' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Files/FileNameRequest.php b/app/Http/Requests/Files/FileNameRequest.php
new file mode 100644
index 00000000..11745939
--- /dev/null
+++ b/app/Http/Requests/Files/FileNameRequest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Requests\Files;
+
+use App\Http\Requests\ApiFormRequest;
+
+class FileNameRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'name' => ['required', 'string', 'max:255', 'regex:/^[^\/\\\\]+$/'],
+        ];
+    }
+
+    protected function prepareForValidation(): void
+    {
+        if ($this->route('name') !== null) {
+            $this->merge(['name' => $this->route('name')]);
+        }
+    }
+}
diff --git a/app/Http/Requests/Finance/FinancialReportRequest.php b/app/Http/Requests/Finance/FinancialReportRequest.php
new file mode 100644
index 00000000..28c3aa5c
--- /dev/null
+++ b/app/Http/Requests/Finance/FinancialReportRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Finance;
+
+use App\Http\Requests\ApiFormRequest;
+
+class FinancialReportRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'date_from' => ['nullable', 'date_format:Y-m-d'],
+            'date_to' => ['nullable', 'date_format:Y-m-d', 'after_or_equal:date_from'],
+            'school_year' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Finance/FinancialSummaryRequest.php b/app/Http/Requests/Finance/FinancialSummaryRequest.php
new file mode 100644
index 00000000..1f1c43dd
--- /dev/null
+++ b/app/Http/Requests/Finance/FinancialSummaryRequest.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Http\Requests\Finance;
+
+class FinancialSummaryRequest extends FinancialReportRequest
+{
+}
diff --git a/app/Http/Requests/Finance/FinancialUnpaidParentsRequest.php b/app/Http/Requests/Finance/FinancialUnpaidParentsRequest.php
new file mode 100644
index 00000000..a555b306
--- /dev/null
+++ b/app/Http/Requests/Finance/FinancialUnpaidParentsRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Finance;
+
+use App\Http\Requests\ApiFormRequest;
+
+class FinancialUnpaidParentsRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/BelowSixtyEmailRequest.php b/app/Http/Requests/Grading/BelowSixtyEmailRequest.php
new file mode 100644
index 00000000..ae522f03
--- /dev/null
+++ b/app/Http/Requests/Grading/BelowSixtyEmailRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class BelowSixtyEmailRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'student_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/BelowSixtyListRequest.php b/app/Http/Requests/Grading/BelowSixtyListRequest.php
new file mode 100644
index 00000000..b7d9aa76
--- /dev/null
+++ b/app/Http/Requests/Grading/BelowSixtyListRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class BelowSixtyListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/BelowSixtyMeetingRequest.php b/app/Http/Requests/Grading/BelowSixtyMeetingRequest.php
new file mode 100644
index 00000000..2ef7d547
--- /dev/null
+++ b/app/Http/Requests/Grading/BelowSixtyMeetingRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class BelowSixtyMeetingRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'student_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/BelowSixtyMeetingSaveRequest.php b/app/Http/Requests/Grading/BelowSixtyMeetingSaveRequest.php
new file mode 100644
index 00000000..a2edf090
--- /dev/null
+++ b/app/Http/Requests/Grading/BelowSixtyMeetingSaveRequest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class BelowSixtyMeetingSaveRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'student_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'date' => ['required', 'string', 'max:20'],
+            'time' => ['nullable', 'string', 'max:20'],
+            'notes' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/BelowSixtySendRequest.php b/app/Http/Requests/Grading/BelowSixtySendRequest.php
new file mode 100644
index 00000000..117a8154
--- /dev/null
+++ b/app/Http/Requests/Grading/BelowSixtySendRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class BelowSixtySendRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'student_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'subject' => ['nullable', 'string', 'max:255'],
+            'html' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/BelowSixtyStatusRequest.php b/app/Http/Requests/Grading/BelowSixtyStatusRequest.php
new file mode 100644
index 00000000..8339abfc
--- /dev/null
+++ b/app/Http/Requests/Grading/BelowSixtyStatusRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class BelowSixtyStatusRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'student_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'status' => ['required', 'string', 'in:Open,Closed,open,closed'],
+            'note' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/GradingLockAllRequest.php b/app/Http/Requests/Grading/GradingLockAllRequest.php
new file mode 100644
index 00000000..d3a54393
--- /dev/null
+++ b/app/Http/Requests/Grading/GradingLockAllRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class GradingLockAllRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/GradingLockRequest.php b/app/Http/Requests/Grading/GradingLockRequest.php
new file mode 100644
index 00000000..9b262b3e
--- /dev/null
+++ b/app/Http/Requests/Grading/GradingLockRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class GradingLockRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/GradingOverviewRequest.php b/app/Http/Requests/Grading/GradingOverviewRequest.php
new file mode 100644
index 00000000..f0e06e7b
--- /dev/null
+++ b/app/Http/Requests/Grading/GradingOverviewRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class GradingOverviewRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_id' => ['nullable', 'integer', 'min:1'],
+            'semester' => ['nullable', 'string', 'max:50'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/GradingRefreshRequest.php b/app/Http/Requests/Grading/GradingRefreshRequest.php
new file mode 100644
index 00000000..5a54de98
--- /dev/null
+++ b/app/Http/Requests/Grading/GradingRefreshRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class GradingRefreshRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/GradingScoreShowRequest.php b/app/Http/Requests/Grading/GradingScoreShowRequest.php
new file mode 100644
index 00000000..cb025e86
--- /dev/null
+++ b/app/Http/Requests/Grading/GradingScoreShowRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class GradingScoreShowRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/GradingScoreUpdateRequest.php b/app/Http/Requests/Grading/GradingScoreUpdateRequest.php
new file mode 100644
index 00000000..0ba665ab
--- /dev/null
+++ b/app/Http/Requests/Grading/GradingScoreUpdateRequest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class GradingScoreUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'type' => ['required', 'string', 'in:homework,quiz,project,midterm,final,test,comments'],
+            'student_id' => ['required', 'integer', 'min:1'],
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'score_ids' => ['nullable', 'array'],
+            'scores' => ['nullable', 'array'],
+            'comments' => ['nullable', 'array'],
+            'score' => ['nullable', 'numeric'],
+            'comment' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/HomeworkTrackingRequest.php b/app/Http/Requests/Grading/HomeworkTrackingRequest.php
new file mode 100644
index 00000000..945dc150
--- /dev/null
+++ b/app/Http/Requests/Grading/HomeworkTrackingRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class HomeworkTrackingRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'semester' => ['nullable', 'string', 'max:50'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+            'page' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/PlacementBatchRequest.php b/app/Http/Requests/Grading/PlacementBatchRequest.php
new file mode 100644
index 00000000..49353aa5
--- /dev/null
+++ b/app/Http/Requests/Grading/PlacementBatchRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PlacementBatchRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['required', 'string', 'max:50'],
+            'placement_test' => ['required', 'string', 'max:100'],
+            'placement_level' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/PlacementBatchUpdateRequest.php b/app/Http/Requests/Grading/PlacementBatchUpdateRequest.php
new file mode 100644
index 00000000..95127d36
--- /dev/null
+++ b/app/Http/Requests/Grading/PlacementBatchUpdateRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PlacementBatchUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['required', 'string', 'max:50'],
+            'placement_level' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/PlacementLevelRequest.php b/app/Http/Requests/Grading/PlacementLevelRequest.php
new file mode 100644
index 00000000..7b026430
--- /dev/null
+++ b/app/Http/Requests/Grading/PlacementLevelRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PlacementLevelRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'student_id' => ['required', 'integer', 'min:1'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'placement_level' => ['nullable', 'integer', 'min:1', 'max:3'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/PlacementLevelsRequest.php b/app/Http/Requests/Grading/PlacementLevelsRequest.php
new file mode 100644
index 00000000..bf14daec
--- /dev/null
+++ b/app/Http/Requests/Grading/PlacementLevelsRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PlacementLevelsRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'placement_level' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Grading/PlacementRequest.php b/app/Http/Requests/Grading/PlacementRequest.php
new file mode 100644
index 00000000..5bf9ee2a
--- /dev/null
+++ b/app/Http/Requests/Grading/PlacementRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Grading;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PlacementRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['nullable', 'integer', 'min:1'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'placement_test' => ['nullable', 'string', 'max:100'],
+            'open' => ['nullable', 'string', 'max:5'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Incidents/IncidentCancelRequest.php b/app/Http/Requests/Incidents/IncidentCancelRequest.php
new file mode 100644
index 00000000..5ed63c0b
--- /dev/null
+++ b/app/Http/Requests/Incidents/IncidentCancelRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Incidents;
+
+use App\Http\Requests\ApiFormRequest;
+
+class IncidentCancelRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'state_description' => ['nullable', 'string', 'max:2000'],
+            'action_taken' => ['nullable', 'string', 'max:2000'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Incidents/IncidentCloseRequest.php b/app/Http/Requests/Incidents/IncidentCloseRequest.php
new file mode 100644
index 00000000..7f125196
--- /dev/null
+++ b/app/Http/Requests/Incidents/IncidentCloseRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Incidents;
+
+use App\Http\Requests\ApiFormRequest;
+
+class IncidentCloseRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'state_description' => ['required', 'string', 'max:2000'],
+            'action_taken' => ['nullable', 'string', 'max:2000'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Incidents/IncidentListRequest.php b/app/Http/Requests/Incidents/IncidentListRequest.php
new file mode 100644
index 00000000..ecbb71e8
--- /dev/null
+++ b/app/Http/Requests/Incidents/IncidentListRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Incidents;
+
+use App\Http\Requests\ApiFormRequest;
+
+class IncidentListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:50'],
+            'semester' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Incidents/IncidentStateRequest.php b/app/Http/Requests/Incidents/IncidentStateRequest.php
new file mode 100644
index 00000000..a87fb612
--- /dev/null
+++ b/app/Http/Requests/Incidents/IncidentStateRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Incidents;
+
+use App\Http\Requests\ApiFormRequest;
+
+class IncidentStateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'incident_state' => ['required', 'string', 'in:Open,Closed,Canceled'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Incidents/IncidentStoreRequest.php b/app/Http/Requests/Incidents/IncidentStoreRequest.php
new file mode 100644
index 00000000..b9de4dbb
--- /dev/null
+++ b/app/Http/Requests/Incidents/IncidentStoreRequest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Requests\Incidents;
+
+use App\Http\Requests\ApiFormRequest;
+
+class IncidentStoreRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $incidentTypes = [
+            'payment',
+            'attendance',
+            'grade',
+            'behavior',
+            'talking_off_task',
+            'calling_out',
+            'minor_disruption',
+            'minor_dress_code',
+            'forgetting_materials',
+            'repeated_defiance',
+            'disrespectful_tone',
+            'minor_profanity',
+            'repeated_tardiness',
+            'device_misuse',
+            'minor_conflict',
+            'bullying_harassment',
+            'fighting_aggression',
+            'threats',
+            'theft',
+            'vandalism',
+            'sexual_harassment',
+            'serious_cyber_incident',
+            'contraband',
+            'weapons_drugs',
+            'other',
+        ];
+
+        return [
+            'student_id' => ['required', 'integer', 'min:1', 'exists:students,id'],
+            'grade' => ['required', 'string', 'max:50'],
+            'incident' => ['required', 'string', 'in:' . implode(',', $incidentTypes)],
+            'description' => ['required', 'string', 'max:2000'],
+            'incident_state' => ['nullable', 'string', 'in:Open,Closed,Canceled'],
+            'state_description' => ['nullable', 'string', 'max:2000'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Invoices/InvoiceGenerateRequest.php b/app/Http/Requests/Invoices/InvoiceGenerateRequest.php
new file mode 100644
index 00000000..6059932f
--- /dev/null
+++ b/app/Http/Requests/Invoices/InvoiceGenerateRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Invoices;
+
+use App\Http\Requests\ApiFormRequest;
+
+class InvoiceGenerateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'parent_id' => ['required', 'integer', 'exists:users,id'],
+            'school_year' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Invoices/InvoiceManagementRequest.php b/app/Http/Requests/Invoices/InvoiceManagementRequest.php
new file mode 100644
index 00000000..4831f86a
--- /dev/null
+++ b/app/Http/Requests/Invoices/InvoiceManagementRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Invoices;
+
+use App\Http\Requests\ApiFormRequest;
+
+class InvoiceManagementRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Invoices/InvoiceParentRequest.php b/app/Http/Requests/Invoices/InvoiceParentRequest.php
new file mode 100644
index 00000000..988f5a7b
--- /dev/null
+++ b/app/Http/Requests/Invoices/InvoiceParentRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Invoices;
+
+use App\Http\Requests\ApiFormRequest;
+
+class InvoiceParentRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Invoices/InvoiceStatusRequest.php b/app/Http/Requests/Invoices/InvoiceStatusRequest.php
new file mode 100644
index 00000000..57b4cb84
--- /dev/null
+++ b/app/Http/Requests/Invoices/InvoiceStatusRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Invoices;
+
+use App\Http\Requests\ApiFormRequest;
+
+class InvoiceStatusRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'status' => ['required', 'string', 'in:Unpaid,Partially Paid,Paid,unpaid,partially paid,paid'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentByParentRequest.php b/app/Http/Requests/Payments/PaymentByParentRequest.php
new file mode 100644
index 00000000..dc04c147
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentByParentRequest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentByParentRequest extends ApiFormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentCreateRequest.php b/app/Http/Requests/Payments/PaymentCreateRequest.php
new file mode 100644
index 00000000..7988d911
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentCreateRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentCreateRequest extends ApiFormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'parent_id' => ['required', 'integer', 'exists:users,id'],
+            'total_amount' => ['required', 'numeric', 'min:0.01'],
+            'number_of_installments' => ['required', 'integer', 'min:1'],
+            'payment_date' => ['nullable', 'date'],
+            'payment_method' => ['nullable', 'string', 'max:50'],
+            'payment_type' => ['nullable', 'string', 'max:50'],
+            'status' => ['nullable', 'string', 'max:50'],
+            'semester' => ['nullable', 'string', 'max:50'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentEventChargesListRequest.php b/app/Http/Requests/Payments/PaymentEventChargesListRequest.php
new file mode 100644
index 00000000..47a7cd17
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentEventChargesListRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentEventChargesListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:50'],
+            'semester' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentEventChargesStoreRequest.php b/app/Http/Requests/Payments/PaymentEventChargesStoreRequest.php
new file mode 100644
index 00000000..c2ca92af
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentEventChargesStoreRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentEventChargesStoreRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'parent_id' => ['required', 'integer', 'min:1'],
+            'event_name' => ['required', 'string', 'max:255'],
+            'description' => ['nullable', 'string', 'max:1000'],
+            'amount' => ['required', 'numeric', 'min:0'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'student_ids' => ['nullable', 'array'],
+            'student_ids.*' => ['integer', 'min:1'],
+            'student_id' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentManualEditRequest.php b/app/Http/Requests/Payments/PaymentManualEditRequest.php
new file mode 100644
index 00000000..5332d2a6
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentManualEditRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentManualEditRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'paid_amount' => ['required', 'numeric', 'min:0.01'],
+            'payment_method' => ['required', 'string', 'max:50'],
+            'check_number' => ['nullable', 'string', 'max:100'],
+            'payment_file' => ['nullable', 'file', 'mimes:jpg,jpeg,png,pdf', 'max:5120'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentManualSearchRequest.php b/app/Http/Requests/Payments/PaymentManualSearchRequest.php
new file mode 100644
index 00000000..9b25c5aa
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentManualSearchRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentManualSearchRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'search_term' => ['nullable', 'string', 'max:255'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentManualSuggestRequest.php b/app/Http/Requests/Payments/PaymentManualSuggestRequest.php
new file mode 100644
index 00000000..d87af565
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentManualSuggestRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentManualSuggestRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'q' => ['required', 'string', 'max:255'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentManualUpdateRequest.php b/app/Http/Requests/Payments/PaymentManualUpdateRequest.php
new file mode 100644
index 00000000..8f7283a4
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentManualUpdateRequest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentManualUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'amount' => ['required', 'numeric', 'min:0.01'],
+            'payment_method' => ['required', 'string', 'max:50'],
+            'payment_date' => ['nullable', 'date'],
+            'payment_type' => ['nullable', 'string', 'max:50'],
+            'check_number' => ['nullable', 'string', 'max:100'],
+            'payment_file' => ['nullable', 'file', 'mimes:jpg,jpeg,png,pdf', 'max:5120'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+            'semester' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentNotificationListRequest.php b/app/Http/Requests/Payments/PaymentNotificationListRequest.php
new file mode 100644
index 00000000..e63a96d5
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentNotificationListRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentNotificationListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'from' => ['nullable', 'date'],
+            'to' => ['nullable', 'date'],
+            'type' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentNotificationSendRequest.php b/app/Http/Requests/Payments/PaymentNotificationSendRequest.php
new file mode 100644
index 00000000..cc77ad73
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentNotificationSendRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentNotificationSendRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'parent_id' => ['nullable', 'integer', 'min:1'],
+            'type' => ['nullable', 'string', 'max:50'],
+            'force' => ['nullable', 'boolean'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentTransactionCreateRequest.php b/app/Http/Requests/Payments/PaymentTransactionCreateRequest.php
new file mode 100644
index 00000000..3774ffe1
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentTransactionCreateRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentTransactionCreateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'transaction_id' => ['required', 'string', 'max:100'],
+            'payment_id' => ['required', 'integer', 'min:1'],
+            'transaction_date' => ['nullable', 'date'],
+            'amount' => ['required', 'numeric', 'min:0.01'],
+            'payment_method' => ['required', 'string', 'max:50'],
+            'payment_status' => ['nullable', 'string', 'max:50'],
+            'transaction_fee' => ['nullable', 'numeric', 'min:0'],
+            'payment_reference' => ['nullable', 'string', 'max:100'],
+            'is_full_payment' => ['nullable', 'boolean'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+            'semester' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentTransactionStatusRequest.php b/app/Http/Requests/Payments/PaymentTransactionStatusRequest.php
new file mode 100644
index 00000000..116d7946
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentTransactionStatusRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentTransactionStatusRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'status' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaymentUpdateBalanceRequest.php b/app/Http/Requests/Payments/PaymentUpdateBalanceRequest.php
new file mode 100644
index 00000000..f7f6e29b
--- /dev/null
+++ b/app/Http/Requests/Payments/PaymentUpdateBalanceRequest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaymentUpdateBalanceRequest extends ApiFormRequest
+{
+    public function rules(): array
+    {
+        return [
+            'paid_amount' => ['required', 'numeric', 'min:0.01'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaypalExecuteRequest.php b/app/Http/Requests/Payments/PaypalExecuteRequest.php
new file mode 100644
index 00000000..7879bba9
--- /dev/null
+++ b/app/Http/Requests/Payments/PaypalExecuteRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaypalExecuteRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'payer_id' => ['required', 'string', 'max:100'],
+            'paypal_payment_id' => ['nullable', 'string', 'max:100'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Payments/PaypalTransactionsListRequest.php b/app/Http/Requests/Payments/PaypalTransactionsListRequest.php
new file mode 100644
index 00000000..7f7a1dea
--- /dev/null
+++ b/app/Http/Requests/Payments/PaypalTransactionsListRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Payments;
+
+use App\Http\Requests\ApiFormRequest;
+
+class PaypalTransactionsListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'q' => ['nullable', 'string', 'max:200'],
+            'per_page' => ['nullable', 'integer', 'min:1', 'max:100'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementBatchAdminFileRequest.php b/app/Http/Requests/Reimbursements/ReimbursementBatchAdminFileRequest.php
new file mode 100644
index 00000000..292b87f5
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementBatchAdminFileRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementBatchAdminFileRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'batch_id' => ['required', 'integer', 'min:1'],
+            'admin_id' => ['required', 'integer', 'min:0'],
+            'check_file' => ['required', 'file', 'max:5120', 'mimes:jpg,jpeg,png,webp,gif,pdf'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementBatchAssignmentRequest.php b/app/Http/Requests/Reimbursements/ReimbursementBatchAssignmentRequest.php
new file mode 100644
index 00000000..39af028a
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementBatchAssignmentRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementBatchAssignmentRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'expense_id' => ['required', 'integer', 'min:1'],
+            'batch_id' => ['nullable', 'integer', 'min:0'],
+            'batch_number' => ['nullable', 'integer', 'min:0'],
+            'admin_id' => ['nullable', 'integer', 'min:0'],
+            'reimbursement_id' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementBatchCreateRequest.php b/app/Http/Requests/Reimbursements/ReimbursementBatchCreateRequest.php
new file mode 100644
index 00000000..082c8c06
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementBatchCreateRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementBatchCreateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'title' => ['nullable', 'string', 'max:255'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementBatchEmailRequest.php b/app/Http/Requests/Reimbursements/ReimbursementBatchEmailRequest.php
new file mode 100644
index 00000000..afff7739
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementBatchEmailRequest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementBatchEmailRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'batch_id' => ['required', 'integer', 'min:1'],
+            'recipient_email' => ['required', 'email'],
+            'message' => ['nullable', 'string'],
+            'receipts' => ['nullable', 'array'],
+            'receipts.*' => ['integer', 'min:1'],
+            'checks' => ['nullable', 'array'],
+            'checks.*' => ['integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementBatchLockRequest.php b/app/Http/Requests/Reimbursements/ReimbursementBatchLockRequest.php
new file mode 100644
index 00000000..7f26eb24
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementBatchLockRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementBatchLockRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'batch_id' => ['required', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementExportBatchRequest.php b/app/Http/Requests/Reimbursements/ReimbursementExportBatchRequest.php
new file mode 100644
index 00000000..10e3e5f4
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementExportBatchRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementExportBatchRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'batch_id' => ['required', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementExportRequest.php b/app/Http/Requests/Reimbursements/ReimbursementExportRequest.php
new file mode 100644
index 00000000..2f6523cf
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementExportRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementExportRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'type' => ['nullable', 'in:processed,under_processing'],
+            'school_year' => ['nullable', 'string', 'max:20'],
+            'semester' => ['nullable', 'string', 'max:20'],
+            'status' => ['nullable', 'string', 'max:50'],
+            'user_id' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementIndexRequest.php b/app/Http/Requests/Reimbursements/ReimbursementIndexRequest.php
new file mode 100644
index 00000000..6d99a380
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementIndexRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementIndexRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:20'],
+            'semester' => ['nullable', 'string', 'max:20'],
+            'status' => ['nullable', 'string', 'max:50'],
+            'user_id' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementMarkDonationRequest.php b/app/Http/Requests/Reimbursements/ReimbursementMarkDonationRequest.php
new file mode 100644
index 00000000..9c819910
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementMarkDonationRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementMarkDonationRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'expense_id' => ['required', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementProcessRequest.php b/app/Http/Requests/Reimbursements/ReimbursementProcessRequest.php
new file mode 100644
index 00000000..33a0f11c
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementProcessRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementProcessRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'amount' => ['required', 'numeric', 'gt:0'],
+            'reimbursed_to' => ['required', 'integer', 'min:1'],
+            'reimbursement_method' => ['required', 'in:Cash,Check'],
+            'check_number' => ['required_if:reimbursement_method,Check', 'nullable', 'string', 'max:50'],
+            'receipt' => ['nullable', 'file', 'max:2048', 'mimes:jpg,jpeg,png,webp,gif,pdf'],
+            'expense_id' => ['nullable', 'integer', 'min:1'],
+            'description' => ['nullable', 'string'],
+            'school_year' => ['nullable', 'string', 'max:20'],
+            'semester' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementStoreRequest.php b/app/Http/Requests/Reimbursements/ReimbursementStoreRequest.php
new file mode 100644
index 00000000..83423544
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementStoreRequest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementStoreRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'amount' => ['required', 'numeric', 'gt:0'],
+            'reimbursed_to' => ['required', 'integer', 'min:1'],
+            'reimbursement_method' => ['required', 'in:Cash,Check'],
+            'check_number' => ['required_if:reimbursement_method,Check', 'nullable', 'string', 'max:50'],
+            'receipt' => ['required_if:reimbursement_method,Check', 'nullable', 'file', 'max:2048', 'mimes:jpg,jpeg,png,webp,gif,pdf'],
+            'expense_id' => ['nullable', 'integer', 'min:1'],
+            'description' => ['nullable', 'string'],
+            'school_year' => ['nullable', 'string', 'max:20'],
+            'semester' => ['nullable', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementUnderProcessingRequest.php b/app/Http/Requests/Reimbursements/ReimbursementUnderProcessingRequest.php
new file mode 100644
index 00000000..e4343265
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementUnderProcessingRequest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementUnderProcessingRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Http/Requests/Reimbursements/ReimbursementUpdateRequest.php b/app/Http/Requests/Reimbursements/ReimbursementUpdateRequest.php
new file mode 100644
index 00000000..cedd7ce5
--- /dev/null
+++ b/app/Http/Requests/Reimbursements/ReimbursementUpdateRequest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Requests\Reimbursements;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ReimbursementUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'amount' => ['required', 'numeric', 'gt:0'],
+            'reimbursed_to' => ['required', 'integer', 'min:1'],
+            'reimbursement_method' => ['required', 'in:Cash,Check'],
+            'check_number' => ['required_if:reimbursement_method,Check', 'nullable', 'string', 'max:50'],
+            'receipt' => ['nullable', 'file', 'max:2048', 'mimes:jpg,jpeg,png,webp,gif,pdf'],
+            'remove_receipt' => ['nullable', 'boolean'],
+            'description' => ['nullable', 'string'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreAddColumnRequest.php b/app/Http/Requests/Scores/ScoreAddColumnRequest.php
new file mode 100644
index 00000000..68b01ba3
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreAddColumnRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreAddColumnRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreClassRequest.php b/app/Http/Requests/Scores/ScoreClassRequest.php
new file mode 100644
index 00000000..27aba95e
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreClassRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreClassRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['nullable', 'string', 'max:50'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreCommentListRequest.php b/app/Http/Requests/Scores/ScoreCommentListRequest.php
new file mode 100644
index 00000000..44860acb
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreCommentListRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreCommentListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['nullable'],
+            'semester' => ['nullable', 'string', 'max:50'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreCommentSaveRequest.php b/app/Http/Requests/Scores/ScoreCommentSaveRequest.php
new file mode 100644
index 00000000..7ca48fe0
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreCommentSaveRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreCommentSaveRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'comments' => ['required', 'array'],
+            'missing_ok' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreCommentUpdateRequest.php b/app/Http/Requests/Scores/ScoreCommentUpdateRequest.php
new file mode 100644
index 00000000..558cbe04
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreCommentUpdateRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreCommentUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'comments' => ['nullable', 'array'],
+            'reviews' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreLockRequest.php b/app/Http/Requests/Scores/ScoreLockRequest.php
new file mode 100644
index 00000000..c576943a
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreLockRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreLockRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'missing_ok' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreOverviewRequest.php b/app/Http/Requests/Scores/ScoreOverviewRequest.php
new file mode 100644
index 00000000..969200a0
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreOverviewRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreOverviewRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['nullable', 'integer', 'min:1'],
+            'semester' => ['nullable', 'string', 'max:50'],
+            'school_year' => ['nullable', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScorePredictorRequest.php b/app/Http/Requests/Scores/ScorePredictorRequest.php
new file mode 100644
index 00000000..aa0b3127
--- /dev/null
+++ b/app/Http/Requests/Scores/ScorePredictorRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScorePredictorRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['nullable', 'string', 'max:50'],
+            'class_section_id' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreStudentRequest.php b/app/Http/Requests/Scores/ScoreStudentRequest.php
new file mode 100644
index 00000000..fbf6264a
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreStudentRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreStudentRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['required', 'string', 'max:50'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Scores/ScoreUpdateRequest.php b/app/Http/Requests/Scores/ScoreUpdateRequest.php
new file mode 100644
index 00000000..944e0a31
--- /dev/null
+++ b/app/Http/Requests/Scores/ScoreUpdateRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Requests\Scores;
+
+use App\Http\Requests\ApiFormRequest;
+
+class ScoreUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'class_section_id' => ['required', 'integer', 'min:1'],
+            'semester' => ['required', 'string', 'max:50'],
+            'school_year' => ['required', 'string', 'max:50'],
+            'scores' => ['required', 'array'],
+            'missing_ok' => ['nullable', 'array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Semesters/SchoolYearRangeRequest.php b/app/Http/Requests/Semesters/SchoolYearRangeRequest.php
new file mode 100644
index 00000000..7519d1ad
--- /dev/null
+++ b/app/Http/Requests/Semesters/SchoolYearRangeRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Semesters;
+
+use App\Http\Requests\ApiFormRequest;
+
+class SchoolYearRangeRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['required', 'string', 'regex:/^\\d{4}-\\d{4}$/'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Semesters/SemesterNormalizeRequest.php b/app/Http/Requests/Semesters/SemesterNormalizeRequest.php
new file mode 100644
index 00000000..26ad860c
--- /dev/null
+++ b/app/Http/Requests/Semesters/SemesterNormalizeRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Semesters;
+
+use App\Http\Requests\ApiFormRequest;
+
+class SemesterNormalizeRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'semester' => ['required', 'string', 'max:20'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Semesters/SemesterRangeRequest.php b/app/Http/Requests/Semesters/SemesterRangeRequest.php
new file mode 100644
index 00000000..098eb8aa
--- /dev/null
+++ b/app/Http/Requests/Semesters/SemesterRangeRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Semesters;
+
+use App\Http\Requests\ApiFormRequest;
+
+class SemesterRangeRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'school_year' => ['required', 'string', 'regex:/^\\d{4}-\\d{4}$/'],
+            'semester' => ['required', 'string', 'in:Fall,Spring,fall,spring'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Semesters/SemesterResolveRequest.php b/app/Http/Requests/Semesters/SemesterResolveRequest.php
new file mode 100644
index 00000000..18eaade8
--- /dev/null
+++ b/app/Http/Requests/Semesters/SemesterResolveRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Requests\Semesters;
+
+use App\Http\Requests\ApiFormRequest;
+
+class SemesterResolveRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'date' => ['nullable', 'date'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Users/LoginActivityRequest.php b/app/Http/Requests/Users/LoginActivityRequest.php
new file mode 100644
index 00000000..0f0aa6a9
--- /dev/null
+++ b/app/Http/Requests/Users/LoginActivityRequest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Requests\Users;
+
+use App\Http\Requests\ApiFormRequest;
+
+class LoginActivityRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'per_page' => ['nullable', 'integer', 'min:1', 'max:200'],
+            'page' => ['nullable', 'integer', 'min:1'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Users/UserListRequest.php b/app/Http/Requests/Users/UserListRequest.php
new file mode 100644
index 00000000..83138bc1
--- /dev/null
+++ b/app/Http/Requests/Users/UserListRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Requests\Users;
+
+use App\Http\Requests\ApiFormRequest;
+use Illuminate\Validation\Rule;
+
+class UserListRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'sort' => ['nullable', 'string', Rule::in(['id', 'firstname', 'lastname', 'email', 'status', 'updated_at'])],
+            'order' => ['nullable', 'string', Rule::in(['asc', 'desc'])],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Users/UserStoreRequest.php b/app/Http/Requests/Users/UserStoreRequest.php
new file mode 100644
index 00000000..71e8339d
--- /dev/null
+++ b/app/Http/Requests/Users/UserStoreRequest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Requests\Users;
+
+use App\Http\Requests\ApiFormRequest;
+use Illuminate\Validation\Rule;
+
+class UserStoreRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        return [
+            'firstname' => ['required', 'string', 'max:255'],
+            'lastname' => ['required', 'string', 'max:255'],
+            'gender' => ['nullable', 'string', Rule::in(['Male', 'Female', 'male', 'female', 'MALE', 'FEMALE'])],
+            'cellphone' => ['required', 'string', 'max:25'],
+            'email' => ['required', 'email', 'max:255', 'unique:users,email'],
+            'address_street' => ['required', 'string', 'max:255'],
+            'apt' => ['nullable', 'string', 'max:25'],
+            'city' => ['required', 'string', 'max:255'],
+            'state' => ['required', 'string', 'max:25'],
+            'zip' => ['required', 'string', 'max:25'],
+            'accept_school_policy' => ['required', 'boolean'],
+            'role_id' => ['required', 'integer', 'exists:roles,id'],
+            'password' => ['required', 'string', 'min:6'],
+            'semester' => ['required', 'string', 'max:255'],
+            'school_year' => ['nullable', 'string', 'max:9'],
+            'school_id' => ['nullable', 'integer'],
+            'user_type' => ['nullable', 'string', Rule::in(['primary', 'secondary', 'tertiary'])],
+            'rfid_tag' => ['nullable', 'string', 'max:100'],
+            'status' => ['nullable', 'string', Rule::in(['Active', 'Inactive'])],
+            'is_verified' => ['nullable', 'boolean'],
+            'is_suspended' => ['nullable', 'boolean'],
+            'failed_attempts' => ['nullable', 'integer'],
+            'last_failed_at' => ['nullable', 'date'],
+            'token' => ['nullable', 'string', 'max:255'],
+            'account_id' => ['nullable', 'string', 'max:255'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/Users/UserUpdateRequest.php b/app/Http/Requests/Users/UserUpdateRequest.php
new file mode 100644
index 00000000..0fb48c0f
--- /dev/null
+++ b/app/Http/Requests/Users/UserUpdateRequest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Requests\Users;
+
+use App\Http\Requests\ApiFormRequest;
+use Illuminate\Validation\Rule;
+
+class UserUpdateRequest extends ApiFormRequest
+{
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function rules(): array
+    {
+        $userId = (int) ($this->route('userId') ?? 0);
+
+        return [
+            'firstname' => ['sometimes', 'string', 'max:255'],
+            'lastname' => ['sometimes', 'string', 'max:255'],
+            'gender' => ['sometimes', 'nullable', 'string', Rule::in(['Male', 'Female', 'male', 'female', 'MALE', 'FEMALE'])],
+            'cellphone' => ['sometimes', 'string', 'max:25'],
+            'email' => ['sometimes', 'email', 'max:255', Rule::unique('users', 'email')->ignore($userId)],
+            'address_street' => ['sometimes', 'string', 'max:255'],
+            'apt' => ['sometimes', 'nullable', 'string', 'max:25'],
+            'city' => ['sometimes', 'string', 'max:255'],
+            'state' => ['sometimes', 'string', 'max:25'],
+            'zip' => ['sometimes', 'string', 'max:25'],
+            'accept_school_policy' => ['sometimes', 'boolean'],
+            'semester' => ['sometimes', 'string', 'max:255'],
+            'school_year' => ['sometimes', 'nullable', 'string', 'max:9'],
+            'school_id' => ['sometimes', 'nullable', 'integer'],
+            'user_type' => ['sometimes', 'nullable', 'string', Rule::in(['primary', 'secondary', 'tertiary'])],
+            'rfid_tag' => ['sometimes', 'nullable', 'string', 'max:100'],
+            'status' => ['sometimes', 'string', Rule::in(['Active', 'Inactive'])],
+            'is_verified' => ['sometimes', 'boolean'],
+            'is_suspended' => ['sometimes', 'boolean'],
+            'failed_attempts' => ['sometimes', 'nullable', 'integer'],
+            'last_failed_at' => ['sometimes', 'nullable', 'date'],
+            'token' => ['sometimes', 'nullable', 'string', 'max:255'],
+            'account_id' => ['sometimes', 'nullable', 'string', 'max:255'],
+        ];
+    }
+}
diff --git a/app/Http/Resources/Auth/RegisterResource.php b/app/Http/Resources/Auth/RegisterResource.php
new file mode 100644
index 00000000..8ea04cc4
--- /dev/null
+++ b/app/Http/Resources/Auth/RegisterResource.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Resources\Auth;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class RegisterResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        $user = $this->resource['user'] ?? null;
+
+        return [
+            'user_id' => $user?->id,
+            'email' => $user?->email,
+            'firstname' => $user?->firstname,
+            'lastname' => $user?->lastname,
+            'role' => $this->resource['role'] ?? null,
+            'activation_sent' => (bool) ($this->resource['activation_sent'] ?? false),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Discounts/DiscountParentResource.php b/app/Http/Resources/Discounts/DiscountParentResource.php
new file mode 100644
index 00000000..b88fd7f5
--- /dev/null
+++ b/app/Http/Resources/Discounts/DiscountParentResource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Resources\Discounts;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DiscountParentResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this['id'] ?? null,
+            'firstname' => $this['firstname'] ?? '',
+            'lastname' => $this['lastname'] ?? '',
+            'email' => $this['email'] ?? '',
+            'total_discount' => (float) ($this['total_discount'] ?? 0),
+            'has_discount' => (int) ($this['has_discount'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Discounts/DiscountVoucherResource.php b/app/Http/Resources/Discounts/DiscountVoucherResource.php
new file mode 100644
index 00000000..33262b1e
--- /dev/null
+++ b/app/Http/Resources/Discounts/DiscountVoucherResource.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Resources\Discounts;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DiscountVoucherResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this->id,
+            'code' => $this->code,
+            'discount_type' => $this->discount_type,
+            'discount_value' => $this->discount_value,
+            'max_uses' => $this->max_uses,
+            'times_used' => $this->times_used,
+            'valid_from' => $this->valid_from,
+            'valid_until' => $this->valid_until,
+            'is_active' => (bool) $this->is_active,
+            'description' => $this->description,
+            'school_year' => $this->school_year,
+            'semester' => $this->semester,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Expenses/ExpenseResource.php b/app/Http/Resources/Expenses/ExpenseResource.php
new file mode 100644
index 00000000..5fd63293
--- /dev/null
+++ b/app/Http/Resources/Expenses/ExpenseResource.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Resources\Expenses;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ExpenseResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this['id'] ?? $this->id,
+            'category' => $this['category'] ?? $this->category,
+            'amount' => $this['amount'] ?? $this->amount,
+            'receipt_path' => $this['receipt_path'] ?? $this->receipt_path,
+            'receipt_url' => $this['receipt_url'] ?? null,
+            'description' => $this['description'] ?? $this->description,
+            'retailor' => $this['retailor'] ?? $this->retailor,
+            'date_of_purchase' => $this['date_of_purchase'] ?? $this->date_of_purchase,
+            'purchased_by' => $this['purchased_by'] ?? $this->purchased_by,
+            'added_by' => $this['added_by'] ?? $this->added_by,
+            'school_year' => $this['school_year'] ?? $this->school_year,
+            'semester' => $this['semester'] ?? $this->semester,
+            'status' => $this['status'] ?? $this->status,
+            'status_reason' => $this['status_reason'] ?? $this->status_reason,
+            'approved_by' => $this['approved_by'] ?? $this->approved_by,
+            'updated_by' => $this['updated_by'] ?? $this->updated_by,
+            'purchaser_firstname' => $this['purchaser_firstname'] ?? null,
+            'purchaser_lastname' => $this['purchaser_lastname'] ?? null,
+            'approver_firstname' => $this['approver_firstname'] ?? null,
+            'approver_lastname' => $this['approver_lastname'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Expenses/ExpenseStaffResource.php b/app/Http/Resources/Expenses/ExpenseStaffResource.php
new file mode 100644
index 00000000..18a63838
--- /dev/null
+++ b/app/Http/Resources/Expenses/ExpenseStaffResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Expenses;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ExpenseStaffResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this['id'] ?? null,
+            'firstname' => $this['firstname'] ?? '',
+            'lastname' => $this['lastname'] ?? '',
+        ];
+    }
+}
diff --git a/app/Http/Resources/ExtraCharges/ExtraChargeInvoiceOptionResource.php b/app/Http/Resources/ExtraCharges/ExtraChargeInvoiceOptionResource.php
new file mode 100644
index 00000000..c976eea4
--- /dev/null
+++ b/app/Http/Resources/ExtraCharges/ExtraChargeInvoiceOptionResource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Resources\ExtraCharges;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ExtraChargeInvoiceOptionResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this['id'] ?? null,
+            'invoice_number' => $this['invoice_number'] ?? '',
+            'status' => $this['status'] ?? '',
+            'balance' => $this['balance'] ?? 0,
+            'issue_date' => $this['issue_date'] ?? null,
+            'text' => $this['text'] ?? '',
+        ];
+    }
+}
diff --git a/app/Http/Resources/ExtraCharges/ExtraChargeParentOptionResource.php b/app/Http/Resources/ExtraCharges/ExtraChargeParentOptionResource.php
new file mode 100644
index 00000000..c88bd5a1
--- /dev/null
+++ b/app/Http/Resources/ExtraCharges/ExtraChargeParentOptionResource.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Resources\ExtraCharges;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ExtraChargeParentOptionResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        return [
+            'id' => $this['id'] ?? null,
+            'text' => $this['text'] ?? '',
+        ];
+    }
+}
diff --git a/app/Http/Resources/ExtraCharges/ExtraChargeResource.php b/app/Http/Resources/ExtraCharges/ExtraChargeResource.php
new file mode 100644
index 00000000..2904b146
--- /dev/null
+++ b/app/Http/Resources/ExtraCharges/ExtraChargeResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources\ExtraCharges;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ExtraChargeResource extends JsonResource
+{
+    public function toArray($request): array
+    {
+        $data = is_array($this->resource) ? $this->resource : $this->resource->toArray();
+
+        return [
+            'id' => (int) ($data['id'] ?? 0),
+            'parent_id' => $data['parent_id'] ?? null,
+            'invoice_id' => $data['invoice_id'] ?? null,
+            'school_year' => $data['school_year'] ?? null,
+            'semester' => $data['semester'] ?? null,
+            'charge_type' => $data['charge_type'] ?? null,
+            'title' => $data['title'] ?? null,
+            'description' => $data['description'] ?? null,
+            'amount' => $data['amount'] ?? null,
+            'due_date' => $data['due_date'] ?? null,
+            'status' => $data['status'] ?? null,
+            'created_by' => $data['created_by'] ?? null,
+            'created_at' => $data['created_at'] ?? null,
+            'parent_name' => $data['parent_name'] ?? null,
+            'invoice_number' => $data['invoice_number'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Files/FileMetaResource.php b/app/Http/Resources/Files/FileMetaResource.php
new file mode 100644
index 00000000..490ace4e
--- /dev/null
+++ b/app/Http/Resources/Files/FileMetaResource.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Resources\Files;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FileMetaResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'name' => $this->resource['name'] ?? null,
+            'mime' => $this->resource['mime'] ?? null,
+            'size' => $this->resource['size'] ?? null,
+            'etag' => $this->resource['etag'] ?? null,
+            'last_modified' => $this->resource['last_modified'] ?? null,
+            'download_name' => $this->resource['download_name'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialDiscountResource.php b/app/Http/Resources/Finance/FinancialDiscountResource.php
new file mode 100644
index 00000000..c9dba25d
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialDiscountResource.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialDiscountResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'invoice_id' => (int) ($this->resource['invoice_id'] ?? 0),
+            'school_year' => $this->resource['school_year'] ?? null,
+            'discount_amount' => (float) ($this->resource['discount_amount'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialExpenseSummaryResource.php b/app/Http/Resources/Finance/FinancialExpenseSummaryResource.php
new file mode 100644
index 00000000..89fd078a
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialExpenseSummaryResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialExpenseSummaryResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'category' => $this->resource['category'] ?? null,
+            'total_amount' => (float) ($this->resource['total_amount'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialInvoiceResource.php b/app/Http/Resources/Finance/FinancialInvoiceResource.php
new file mode 100644
index 00000000..472f0075
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialInvoiceResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialInvoiceResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? 0),
+            'invoice_number' => $this->resource['invoice_number'] ?? null,
+            'parent_id' => (int) ($this->resource['parent_id'] ?? 0),
+            'parent_name' => $this->resource['parent_name'] ?? null,
+            'school_year' => $this->resource['school_year'] ?? null,
+            'total_amount' => (float) ($this->resource['total_amount'] ?? 0),
+            'paid_amount' => (float) ($this->resource['paid_amount'] ?? 0),
+            'balance' => (float) ($this->resource['balance'] ?? 0),
+            'status' => $this->resource['status'] ?? null,
+            'issue_date' => $this->resource['issue_date'] ?? null,
+            'due_date' => $this->resource['due_date'] ?? null,
+            'created_at' => $this->resource['created_at'] ?? null,
+            'updated_at' => $this->resource['updated_at'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialPaymentResource.php b/app/Http/Resources/Finance/FinancialPaymentResource.php
new file mode 100644
index 00000000..9e712c0b
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialPaymentResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialPaymentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'invoice_id' => (int) ($this->resource['invoice_id'] ?? 0),
+            'paid_amount' => (float) ($this->resource['paid_amount'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialRefundResource.php b/app/Http/Resources/Finance/FinancialRefundResource.php
new file mode 100644
index 00000000..eab06035
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialRefundResource.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialRefundResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'invoice_id' => (int) ($this->resource['invoice_id'] ?? 0),
+            'school_year' => $this->resource['school_year'] ?? null,
+            'total_refunded' => (float) ($this->resource['total_refunded'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialReimbursementSummaryResource.php b/app/Http/Resources/Finance/FinancialReimbursementSummaryResource.php
new file mode 100644
index 00000000..f883ff02
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialReimbursementSummaryResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialReimbursementSummaryResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'status' => $this->resource['status'] ?? null,
+            'total_amount' => (float) ($this->resource['total_amount'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialReportResource.php b/app/Http/Resources/Finance/FinancialReportResource.php
new file mode 100644
index 00000000..c0f68f64
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialReportResource.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialReportResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'selectedYear' => $this->resource['selectedYear'] ?? null,
+            'dateFrom' => $this->resource['dateFrom'] ?? null,
+            'dateTo' => $this->resource['dateTo'] ?? null,
+            'schoolYears' => $this->resource['schoolYears'] ?? [],
+            'invoices' => FinancialInvoiceResource::collection($this->resource['invoices'] ?? []),
+            'payments' => FinancialPaymentResource::collection($this->resource['payments'] ?? []),
+            'paymentBreakdown' => $this->resource['paymentBreakdown'] ?? [],
+            'paymentTotals' => $this->resource['paymentTotals'] ?? [],
+            'refunds' => FinancialRefundResource::collection($this->resource['refunds'] ?? []),
+            'expenses' => FinancialExpenseSummaryResource::collection($this->resource['expenses'] ?? []),
+            'reimbursements' => FinancialReimbursementSummaryResource::collection($this->resource['reimbursements'] ?? []),
+            'discounts' => FinancialDiscountResource::collection($this->resource['discounts'] ?? []),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialSummaryResource.php b/app/Http/Resources/Finance/FinancialSummaryResource.php
new file mode 100644
index 00000000..837b8fd0
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialSummaryResource.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialSummaryResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'schoolYear' => $this->resource['schoolYear'] ?? null,
+            'dateFrom' => $this->resource['dateFrom'] ?? null,
+            'dateTo' => $this->resource['dateTo'] ?? null,
+            'totalCharges' => (float) ($this->resource['totalCharges'] ?? 0),
+            'totalExtraCharges' => (float) ($this->resource['totalExtraCharges'] ?? 0),
+            'totalDiscounts' => (float) ($this->resource['totalDiscounts'] ?? 0),
+            'totalRefunds' => (float) ($this->resource['totalRefunds'] ?? 0),
+            'totalExpenses' => (float) ($this->resource['totalExpenses'] ?? 0),
+            'totalReimbursements' => (float) ($this->resource['totalReimbursements'] ?? 0),
+            'donationToSchool' => (float) ($this->resource['donationToSchool'] ?? 0),
+            'totalPaid' => (float) ($this->resource['totalPaid'] ?? 0),
+            'amountCollected' => (float) ($this->resource['amountCollected'] ?? 0),
+            'totalUnpaid' => (float) ($this->resource['totalUnpaid'] ?? 0),
+            'netAmount' => (float) ($this->resource['netAmount'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Finance/FinancialUnpaidParentResource.php b/app/Http/Resources/Finance/FinancialUnpaidParentResource.php
new file mode 100644
index 00000000..1ec1dc7f
--- /dev/null
+++ b/app/Http/Resources/Finance/FinancialUnpaidParentResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources\Finance;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class FinancialUnpaidParentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'parent_id' => (int) ($this->resource['parent_id'] ?? 0),
+            'parent_name' => $this->resource['parent_name'] ?? null,
+            'email' => $this->resource['email'] ?? null,
+            'total_invoice' => (float) ($this->resource['total_invoice'] ?? 0),
+            'total_balance' => (float) ($this->resource['total_balance'] ?? 0),
+            'total_discount' => (float) ($this->resource['total_discount'] ?? 0),
+            'remaining_installments' => (int) ($this->resource['remaining_installments'] ?? 0),
+            'installment_amount' => (float) ($this->resource['installment_amount'] ?? 0),
+            'type' => $this->resource['type'] ?? null,
+            'total_paid' => (float) ($this->resource['total_paid'] ?? 0),
+            'payment_count' => (int) ($this->resource['payment_count'] ?? 0),
+            'has_installment' => (int) ($this->resource['has_installment'] ?? 0),
+            'next_installment' => $this->resource['next_installment'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Grading/BelowSixtyStudentResource.php b/app/Http/Resources/Grading/BelowSixtyStudentResource.php
new file mode 100644
index 00000000..a0a02ae0
--- /dev/null
+++ b/app/Http/Resources/Grading/BelowSixtyStudentResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources\Grading;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class BelowSixtyStudentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'student_id' => (int) ($this->resource['student_id'] ?? 0),
+            'school_id' => $this->resource['school_id'] ?? null,
+            'firstname' => $this->resource['firstname'] ?? null,
+            'lastname' => $this->resource['lastname'] ?? null,
+            'class_section_name' => $this->resource['class_section_name'] ?? null,
+            'homework_avg' => $this->resource['homework_avg'] ?? null,
+            'project_avg' => $this->resource['project_avg'] ?? null,
+            'participation_score' => $this->resource['participation_score'] ?? null,
+            'test_avg' => $this->resource['test_avg'] ?? null,
+            'ptap_score' => $this->resource['ptap_score'] ?? null,
+            'attendance_score' => $this->resource['attendance_score'] ?? null,
+            'midterm_exam_score' => $this->resource['midterm_exam_score'] ?? null,
+            'final_exam_score' => $this->resource['final_exam_score'] ?? null,
+            'semester_score' => $this->resource['semester_score'] ?? null,
+            'comment' => $this->resource['comment'] ?? null,
+            'status' => $this->resource['status'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Grading/GradingScoreResource.php b/app/Http/Resources/Grading/GradingScoreResource.php
new file mode 100644
index 00000000..59d22921
--- /dev/null
+++ b/app/Http/Resources/Grading/GradingScoreResource.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Resources\Grading;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GradingScoreResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return $this->resource->toArray();
+    }
+}
diff --git a/app/Http/Resources/Grading/HomeworkTrackingTeacherResource.php b/app/Http/Resources/Grading/HomeworkTrackingTeacherResource.php
new file mode 100644
index 00000000..8ebd4f51
--- /dev/null
+++ b/app/Http/Resources/Grading/HomeworkTrackingTeacherResource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Resources\Grading;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class HomeworkTrackingTeacherResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'class_section_id' => (int) ($this->resource['class_section_id'] ?? 0),
+            'class_id' => $this->resource['class_id'] ?? null,
+            'class_section_name' => $this->resource['class_section_name'] ?? null,
+            'teachers' => $this->resource['teachers'] ?? [],
+            'tas' => $this->resource['tas'] ?? [],
+        ];
+    }
+}
diff --git a/app/Http/Resources/Incidents/IncidentAnalysisStudentResource.php b/app/Http/Resources/Incidents/IncidentAnalysisStudentResource.php
new file mode 100644
index 00000000..9e81270c
--- /dev/null
+++ b/app/Http/Resources/Incidents/IncidentAnalysisStudentResource.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources\Incidents;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class IncidentAnalysisStudentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'student_id' => $this->resource['student_id'] ?? null,
+            'student_name' => $this->resource['student_name'] ?? null,
+            'grade' => $this->resource['grade'] ?? null,
+            'total' => (int) ($this->resource['total'] ?? 0),
+            'open' => (int) ($this->resource['open'] ?? 0),
+            'closed' => (int) ($this->resource['closed'] ?? 0),
+            'canceled' => (int) ($this->resource['canceled'] ?? 0),
+            'last_incident' => $this->resource['last_incident'] ?? null,
+            'logs' => $this->resource['logs'] ?? [],
+        ];
+    }
+}
diff --git a/app/Http/Resources/Incidents/IncidentGradeResource.php b/app/Http/Resources/Incidents/IncidentGradeResource.php
new file mode 100644
index 00000000..71d47e86
--- /dev/null
+++ b/app/Http/Resources/Incidents/IncidentGradeResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Incidents;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class IncidentGradeResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->resource['id'] ?? null,
+            'name' => $this->resource['name'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Incidents/IncidentResource.php b/app/Http/Resources/Incidents/IncidentResource.php
new file mode 100644
index 00000000..0b9d64a7
--- /dev/null
+++ b/app/Http/Resources/Incidents/IncidentResource.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Resources\Incidents;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class IncidentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->resource['id'] ?? null,
+            'student_id' => $this->resource['student_id'] ?? null,
+            'student_name' => $this->resource['student_name'] ?? null,
+            'grade' => $this->resource['grade'] ?? null,
+            'incident' => $this->resource['incident'] ?? null,
+            'incident_datetime' => $this->resource['incident_datetime'] ?? null,
+            'incident_state' => $this->resource['incident_state'] ?? null,
+            'updated_by_open' => $this->resource['updated_by_open'] ?? null,
+            'updated_by_open_name' => $this->resource['updated_by_open_name'] ?? null,
+            'open_description' => $this->resource['open_description'] ?? null,
+            'updated_by_closed' => $this->resource['updated_by_closed'] ?? null,
+            'updated_by_closed_name' => $this->resource['updated_by_closed_name'] ?? null,
+            'close_description' => $this->resource['close_description'] ?? null,
+            'action_taken' => $this->resource['action_taken'] ?? null,
+            'updated_by_canceled' => $this->resource['updated_by_canceled'] ?? null,
+            'updated_by_canceled_name' => $this->resource['updated_by_canceled_name'] ?? null,
+            'cancel_description' => $this->resource['cancel_description'] ?? null,
+            'semester' => $this->resource['semester'] ?? null,
+            'school_year' => $this->resource['school_year'] ?? null,
+            'created_at' => $this->resource['created_at'] ?? null,
+            'updated_at' => $this->resource['updated_at'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Incidents/IncidentStudentOptionResource.php b/app/Http/Resources/Incidents/IncidentStudentOptionResource.php
new file mode 100644
index 00000000..94c25fc3
--- /dev/null
+++ b/app/Http/Resources/Incidents/IncidentStudentOptionResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Incidents;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class IncidentStudentOptionResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? 0),
+            'name' => $this->resource['name'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Invoices/InvoiceManagementParentResource.php b/app/Http/Resources/Invoices/InvoiceManagementParentResource.php
new file mode 100644
index 00000000..625b4607
--- /dev/null
+++ b/app/Http/Resources/Invoices/InvoiceManagementParentResource.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources\Invoices;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class InvoiceManagementParentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'parent_name' => $this->resource['parent_name'] ?? '',
+            'parent_id' => (int) ($this->resource['parent_id'] ?? 0),
+            'enrolledKids' => $this->resource['enrolledKids'] ?? [],
+            'withdrawnKids' => $this->resource['withdrawnKids'] ?? [],
+            'invoice_amount' => (float) ($this->resource['invoice_amount'] ?? 0),
+            'refund_amount' => (float) ($this->resource['refund_amount'] ?? 0),
+            'last_updated' => $this->resource['last_updated'] ?? null,
+            'invoice_date' => $this->resource['invoice_date'] ?? null,
+            'invoice_id' => $this->resource['invoice_id'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Invoices/InvoiceResource.php b/app/Http/Resources/Invoices/InvoiceResource.php
new file mode 100644
index 00000000..e9db6cfb
--- /dev/null
+++ b/app/Http/Resources/Invoices/InvoiceResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources\Invoices;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class InvoiceResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? 0),
+            'parent_id' => (int) ($this->resource['parent_id'] ?? 0),
+            'invoice_number' => $this->resource['invoice_number'] ?? null,
+            'total_amount' => (float) ($this->resource['total_amount'] ?? 0),
+            'paid_amount' => (float) ($this->resource['paid_amount'] ?? 0),
+            'balance' => (float) ($this->resource['balance'] ?? 0),
+            'status' => $this->resource['status'] ?? null,
+            'school_year' => $this->resource['school_year'] ?? null,
+            'semester' => $this->resource['semester'] ?? null,
+            'issue_date' => $this->resource['issue_date'] ?? null,
+            'due_date' => $this->resource['due_date'] ?? null,
+            'created_at' => $this->resource['created_at'] ?? null,
+            'updated_at' => $this->resource['updated_at'] ?? null,
+            'refund_amount' => (float) ($this->resource['refund_amount'] ?? 0),
+            'last_paid_amount' => (float) ($this->resource['last_paid_amount'] ?? 0),
+            'last_payment_date' => $this->resource['last_payment_date'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Payments/PaymentNotificationLogResource.php b/app/Http/Resources/Payments/PaymentNotificationLogResource.php
new file mode 100644
index 00000000..78b5a744
--- /dev/null
+++ b/app/Http/Resources/Payments/PaymentNotificationLogResource.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Resources\Payments;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PaymentNotificationLogResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        $parent = $this->resource->parent ?? null;
+        $parentName = $parent ? trim(($parent->firstname ?? '') . ' ' . ($parent->lastname ?? '')) : null;
+
+        return [
+            'id' => (int) ($this->resource->id ?? 0),
+            'parent_id' => (int) ($this->resource->parent_id ?? 0),
+            'parent_name' => $parentName,
+            'invoice_id' => $this->resource->invoice_id ? (int) $this->resource->invoice_id : null,
+            'school_year' => $this->resource->school_year ?? null,
+            'period_year' => (int) ($this->resource->period_year ?? 0),
+            'period_month' => (int) ($this->resource->period_month ?? 0),
+            'type' => $this->resource->type ?? null,
+            'to_email' => $this->resource->to_email ?? null,
+            'cc_email' => $this->resource->cc_email ?? null,
+            'status' => $this->resource->status ?? null,
+            'error_message' => $this->resource->error_message ?? null,
+            'balance_snapshot' => (float) ($this->resource->balance_snapshot ?? 0),
+            'sent_at' => $this->resource->sent_at ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Payments/PaymentResource.php b/app/Http/Resources/Payments/PaymentResource.php
new file mode 100644
index 00000000..3c0f43e8
--- /dev/null
+++ b/app/Http/Resources/Payments/PaymentResource.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources\Payments;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PaymentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? 0),
+            'parent_id' => (int) ($this->resource['parent_id'] ?? 0),
+            'invoice_id' => isset($this->resource['invoice_id']) ? (int) $this->resource['invoice_id'] : null,
+            'total_amount' => (float) ($this->resource['total_amount'] ?? 0),
+            'paid_amount' => (float) ($this->resource['paid_amount'] ?? 0),
+            'balance' => (float) ($this->resource['balance'] ?? 0),
+            'number_of_installments' => (int) ($this->resource['number_of_installments'] ?? 0),
+            'transaction_id' => $this->resource['transaction_id'] ?? null,
+            'payment_method' => $this->resource['payment_method'] ?? null,
+            'payment_date' => $this->resource['payment_date'] ?? null,
+            'status' => $this->resource['status'] ?? null,
+            'semester' => $this->resource['semester'] ?? null,
+            'school_year' => $this->resource['school_year'] ?? null,
+            'created_at' => $this->resource['created_at'] ?? null,
+            'updated_at' => $this->resource['updated_at'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Payments/PaymentTransactionResource.php b/app/Http/Resources/Payments/PaymentTransactionResource.php
new file mode 100644
index 00000000..665dd45f
--- /dev/null
+++ b/app/Http/Resources/Payments/PaymentTransactionResource.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Resources\Payments;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PaymentTransactionResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'transaction_id' => $this->resource['transaction_id'] ?? null,
+            'payment_id' => (int) ($this->resource['payment_id'] ?? 0),
+            'transaction_date' => $this->resource['transaction_date'] ?? null,
+            'amount' => (float) ($this->resource['amount'] ?? 0),
+            'payment_method' => $this->resource['payment_method'] ?? null,
+            'payment_status' => $this->resource['payment_status'] ?? null,
+            'transaction_fee' => isset($this->resource['transaction_fee']) ? (float) $this->resource['transaction_fee'] : null,
+            'payment_reference' => $this->resource['payment_reference'] ?? null,
+            'is_full_payment' => isset($this->resource['is_full_payment']) ? (bool) $this->resource['is_full_payment'] : null,
+            'school_year' => $this->resource['school_year'] ?? null,
+            'semester' => $this->resource['semester'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Payments/PaypalTransactionResource.php b/app/Http/Resources/Payments/PaypalTransactionResource.php
new file mode 100644
index 00000000..1430155f
--- /dev/null
+++ b/app/Http/Resources/Payments/PaypalTransactionResource.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Resources\Payments;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PaypalTransactionResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? 0),
+            'transaction_id' => $this->resource['transaction_id'] ?? null,
+            'order_id' => $this->resource['order_id'] ?? null,
+            'parent_school_id' => $this->resource['parent_school_id'] ?? null,
+            'payer_email' => $this->resource['payer_email'] ?? null,
+            'amount' => (float) ($this->resource['amount'] ?? 0),
+            'net_amount' => (float) ($this->resource['net_amount'] ?? 0),
+            'currency' => $this->resource['currency'] ?? null,
+            'status' => $this->resource['status'] ?? null,
+            'event_type' => $this->resource['event_type'] ?? null,
+            'created_at' => $this->resource['created_at'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Reimbursements/ReimbursementBatchResource.php b/app/Http/Resources/Reimbursements/ReimbursementBatchResource.php
new file mode 100644
index 00000000..20ea28be
--- /dev/null
+++ b/app/Http/Resources/Reimbursements/ReimbursementBatchResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources\Reimbursements;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ReimbursementBatchResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'batchId' => (int) ($this->resource['batchId'] ?? 0),
+            'batchNumber' => (int) ($this->resource['batchNumber'] ?? 0),
+            'label' => $this->resource['label'] ?? null,
+            'sequence' => (int) ($this->resource['sequence'] ?? 0),
+            'yearly_batch_number' => (int) ($this->resource['yearly_batch_number'] ?? 0),
+            'slots' => $this->resource['slots'] ?? [],
+            'itemIds' => $this->resource['itemIds'] ?? [],
+            'status' => $this->resource['status'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Reimbursements/ReimbursementExpenseResource.php b/app/Http/Resources/Reimbursements/ReimbursementExpenseResource.php
new file mode 100644
index 00000000..04f61462
--- /dev/null
+++ b/app/Http/Resources/Reimbursements/ReimbursementExpenseResource.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Http\Resources\Reimbursements;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ReimbursementExpenseResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'expense_id' => (int) ($this->resource['id'] ?? $this->resource['expense_id'] ?? 0),
+            'amount' => (float) ($this->resource['amount'] ?? 0),
+            'category' => $this->resource['category'] ?? null,
+            'description' => $this->resource['description'] ?? null,
+            'retailor' => $this->resource['retailor'] ?? null,
+            'purchased_by' => $this->resource['purchased_by'] ?? null,
+            'expense_receipt_url' => $this->resource['expense_receipt_url'] ?? null,
+            'reimbursement_id' => $this->resource['reimb_id'] ?? null,
+            'reimbursement_amount' => isset($this->resource['reimb_amount']) ? (float) $this->resource['reimb_amount'] : null,
+            'reimbursement_method' => $this->resource['reimbursement_method'] ?? null,
+            'check_number' => $this->resource['check_number'] ?? null,
+            'reimb_receipt_url' => $this->resource['reimb_receipt_url'] ?? null,
+            'reimb_status' => $this->resource['reimb_status'] ?? null,
+            'reimbursed_to' => $this->resource['reimb_recipient_id'] ?? null,
+            'reimbursed_firstname' => $this->resource['reimb_firstname'] ?? null,
+            'reimbursed_lastname' => $this->resource['reimb_lastname'] ?? null,
+            'approver_firstname' => $this->resource['approver_firstname'] ?? null,
+            'approver_lastname' => $this->resource['approver_lastname'] ?? null,
+            'school_year' => $this->resource['school_year'] ?? null,
+            'semester' => $this->resource['semester'] ?? null,
+            'reimb_created_at' => $this->resource['reimb_created_at'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Reimbursements/ReimbursementRecipientResource.php b/app/Http/Resources/Reimbursements/ReimbursementRecipientResource.php
new file mode 100644
index 00000000..70f2bfd4
--- /dev/null
+++ b/app/Http/Resources/Reimbursements/ReimbursementRecipientResource.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources\Reimbursements;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ReimbursementRecipientResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        $id = (int) ($this->resource['id'] ?? 0);
+        $first = $this->resource['firstname'] ?? '';
+        $last = $this->resource['lastname'] ?? '';
+        $name = trim($first . ' ' . $last);
+
+        return [
+            'id' => $id,
+            'firstname' => $first,
+            'lastname' => $last,
+            'name' => $name,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Reimbursements/ReimbursementResource.php b/app/Http/Resources/Reimbursements/ReimbursementResource.php
new file mode 100644
index 00000000..768264ab
--- /dev/null
+++ b/app/Http/Resources/Reimbursements/ReimbursementResource.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources\Reimbursements;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ReimbursementResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? $this->resource->id ?? 0),
+            'expense_id' => isset($this->resource['expense_id']) ? (int) $this->resource['expense_id'] : (int) ($this->resource->expense_id ?? 0),
+            'amount' => (float) ($this->resource['amount'] ?? $this->resource->amount ?? 0),
+            'reimbursed_to' => isset($this->resource['reimbursed_to']) ? (int) $this->resource['reimbursed_to'] : (int) ($this->resource->reimbursed_to ?? 0),
+            'description' => $this->resource['description'] ?? $this->resource->description ?? null,
+            'status' => $this->resource['status'] ?? $this->resource->status ?? null,
+            'reimbursement_method' => $this->resource['reimbursement_method'] ?? $this->resource->reimbursement_method ?? null,
+            'check_number' => $this->resource['check_number'] ?? $this->resource->check_number ?? null,
+            'receipt_path' => $this->resource['receipt_path'] ?? $this->resource->receipt_path ?? null,
+            'receipt_url' => $this->resource['receipt_url'] ?? null,
+            'school_year' => $this->resource['school_year'] ?? $this->resource->school_year ?? null,
+            'semester' => $this->resource['semester'] ?? $this->resource->semester ?? null,
+            'batch_number' => isset($this->resource['batch_number']) ? (int) $this->resource['batch_number'] : (int) ($this->resource->batch_number ?? 0),
+            'created_at' => $this->resource['created_at'] ?? $this->resource->created_at ?? null,
+            'updated_at' => $this->resource['updated_at'] ?? $this->resource->updated_at ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Reimbursements/ReimbursementUnderProcessingItemResource.php b/app/Http/Resources/Reimbursements/ReimbursementUnderProcessingItemResource.php
new file mode 100644
index 00000000..2da43d0d
--- /dev/null
+++ b/app/Http/Resources/Reimbursements/ReimbursementUnderProcessingItemResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources\Reimbursements;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ReimbursementUnderProcessingItemResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => (int) ($this->resource['id'] ?? 0),
+            'expense_id' => (int) ($this->resource['expense_id'] ?? 0),
+            'reimbursement_id' => $this->resource['reimbursement_id'] ?? null,
+            'expense_amount' => (float) ($this->resource['expense_amount'] ?? 0),
+            'vendor' => $this->resource['vendor'] ?? null,
+            'description' => $this->resource['description'] ?? null,
+            'purchased_by' => $this->resource['purchased_by'] ?? null,
+            'receipt_url' => $this->resource['receipt_url'] ?? null,
+            'batch_id' => $this->resource['batch_id'] ?? null,
+            'batch_label' => $this->resource['batch_label'] ?? null,
+            'admin_id' => $this->resource['admin_id'] ?? null,
+            'admin_name' => $this->resource['admin_name'] ?? null,
+            'batch_number' => (int) ($this->resource['batch_number'] ?? 0),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Scores/ScoreCommentResource.php b/app/Http/Resources/Scores/ScoreCommentResource.php
new file mode 100644
index 00000000..638f7601
--- /dev/null
+++ b/app/Http/Resources/Scores/ScoreCommentResource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Resources\Scores;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ScoreCommentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'student_id' => (int) ($this->resource['student_id'] ?? 0),
+            'firstname' => $this->resource['firstname'] ?? null,
+            'lastname' => $this->resource['lastname'] ?? null,
+            'school_id' => $this->resource['school_id'] ?? null,
+            'comments' => $this->resource['comments'] ?? [],
+        ];
+    }
+}
diff --git a/app/Http/Resources/Scores/ScorePredictorStudentResource.php b/app/Http/Resources/Scores/ScorePredictorStudentResource.php
new file mode 100644
index 00000000..c7073a8d
--- /dev/null
+++ b/app/Http/Resources/Scores/ScorePredictorStudentResource.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources\Scores;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ScorePredictorStudentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'student_id' => (int) ($this->resource['student_id'] ?? 0),
+            'school_id' => $this->resource['school_id'] ?? null,
+            'firstname' => $this->resource['firstname'] ?? null,
+            'lastname' => $this->resource['lastname'] ?? null,
+            'class_section_id' => $this->resource['class_section_id'] ?? null,
+            'fall_score' => $this->resource['fall_score'] ?? null,
+            'spring_score' => $this->resource['spring_score'] ?? null,
+            'final_average' => $this->resource['final_average'] ?? null,
+            'required_spring_score' => $this->resource['required_spring_score'] ?? null,
+            'winning_risk' => $this->resource['winning_risk'] ?? null,
+            'required_spring_to_pass' => $this->resource['required_spring_to_pass'] ?? null,
+            'failure_risk' => $this->resource['failure_risk'] ?? null,
+            'status' => $this->resource['status'] ?? null,
+            'trophy_awarded' => (bool) ($this->resource['trophy_awarded'] ?? false),
+            'trophy_reason' => $this->resource['trophy_reason'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Scores/ScoreStudentResource.php b/app/Http/Resources/Scores/ScoreStudentResource.php
new file mode 100644
index 00000000..f1abac16
--- /dev/null
+++ b/app/Http/Resources/Scores/ScoreStudentResource.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Resources\Scores;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ScoreStudentResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'student_id' => (int) ($this->resource['student_id'] ?? 0),
+            'firstname' => $this->resource['firstname'] ?? null,
+            'lastname' => $this->resource['lastname'] ?? null,
+            'school_id' => $this->resource['school_id'] ?? null,
+            'scores' => $this->resource['scores'] ?? [],
+            'comments' => $this->resource['comments'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Semesters/SemesterRangeResource.php b/app/Http/Resources/Semesters/SemesterRangeResource.php
new file mode 100644
index 00000000..54fcb49c
--- /dev/null
+++ b/app/Http/Resources/Semesters/SemesterRangeResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Semesters;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SemesterRangeResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'start_date' => $this->resource['start_date'] ?? null,
+            'end_date' => $this->resource['end_date'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Semesters/SemesterResolveResource.php b/app/Http/Resources/Semesters/SemesterResolveResource.php
new file mode 100644
index 00000000..22b3bd9a
--- /dev/null
+++ b/app/Http/Resources/Semesters/SemesterResolveResource.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Resources\Semesters;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class SemesterResolveResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'date' => $this->resource['date'] ?? null,
+            'semester' => $this->resource['semester'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Users/LoginActivityResource.php b/app/Http/Resources/Users/LoginActivityResource.php
new file mode 100644
index 00000000..43ead345
--- /dev/null
+++ b/app/Http/Resources/Users/LoginActivityResource.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Resources\Users;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class LoginActivityResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'user_id' => $this->resource['user_id'] ?? null,
+            'email' => $this->resource['email'] ?? null,
+            'login_time' => $this->resource['login_time'] ?? null,
+            'logout_time' => $this->resource['logout_time'] ?? null,
+            'ip_address' => $this->resource['ip_address'] ?? null,
+            'user_agent' => $this->resource['user_agent'] ?? null,
+        ];
+    }
+}
diff --git a/app/Http/Resources/Users/UserWithRolesResource.php b/app/Http/Resources/Users/UserWithRolesResource.php
new file mode 100644
index 00000000..551afe12
--- /dev/null
+++ b/app/Http/Resources/Users/UserWithRolesResource.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Resources\Users;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserWithRolesResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            'user' => $this->resource['user'] ?? null,
+            'roles' => $this->resource['roles'] ?? [],
+            'role_ids' => $this->resource['role_ids'] ?? [],
+            'parent_type' => $this->resource['parent_type'] ?? '',
+            'second_from_parents' => $this->resource['second_from_parents'] ?? '',
+        ];
+    }
+}
diff --git a/app/Interfaces/ScoreCalculatorInterface.php b/app/Interfaces/ScoreCalculatorInterface.php
new file mode 100644
index 00000000..f1ad6926
--- /dev/null
+++ b/app/Interfaces/ScoreCalculatorInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Interfaces;
+
+interface ScoreCalculatorInterface
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array;
+}
diff --git a/app/Models/CurrentIncident.php b/app/Models/CurrentIncident.php
new file mode 100644
index 00000000..736a79fc
--- /dev/null
+++ b/app/Models/CurrentIncident.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\BaseModel;
+
+class CurrentIncident extends BaseModel
+{
+    protected $table = 'current_incident';
+
+    public $timestamps = true;
+
+    protected $fillable = [
+        'student_id',
+        'student_name',
+        'grade',
+        'incident',
+        'incident_datetime',
+        'incident_state',
+        'updated_by_open',
+        'open_description',
+        'updated_by_closed',
+        'close_description',
+        'action_taken',
+        'updated_by_canceled',
+        'cancel_description',
+        'semester',
+        'school_year',
+        'created_at',
+        'updated_at',
+    ];
+
+    protected $casts = [
+        'student_id' => 'integer',
+        'updated_by_open' => 'integer',
+        'updated_by_closed' => 'integer',
+        'updated_by_canceled' => 'integer',
+        'incident_datetime' => 'datetime',
+    ];
+}
diff --git a/app/Models/Flag.php b/app/Models/Incident.php
similarity index 86%
rename from app/Models/Flag.php
rename to app/Models/Incident.php
index 2e8a7324..3ab7d922 100644
--- a/app/Models/Flag.php
+++ b/app/Models/Incident.php
@@ -4,9 +4,9 @@ namespace App\Models;
 
 use App\Models\BaseModel;
 
-class Flag extends BaseModel
+class Incident extends BaseModel
 {
-    protected $table = 'flag';
+    protected $table = 'incident';
 
     // Table contains created_at/updated_at; enable auto timestamps (recommended).
     public $timestamps = true;
@@ -15,9 +15,9 @@ class Flag extends BaseModel
         'student_id',
         'student_name',
         'grade',
-        'flag',
-        'flag_datetime',
-        'flag_state',
+        'incident',
+        'incident_datetime',
+        'incident_state',
         'updated_by_open',
         'open_description',
         'updated_by_closed',
@@ -36,7 +36,7 @@ class Flag extends BaseModel
         'updated_by_open'     => 'integer',
         'updated_by_closed'   => 'integer',
         'updated_by_canceled' => 'integer',
-        'flag_datetime'       => 'datetime',
+        'incident_datetime'   => 'datetime',
     ];
 
     /* Optional relationships */
@@ -59,4 +59,4 @@ class Flag extends BaseModel
     {
         return $this->belongsTo(User::class, 'updated_by_canceled');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Models/PaymentTransaction.php b/app/Models/PaymentTransaction.php
index 4c053223..67e67e95 100644
--- a/app/Models/PaymentTransaction.php
+++ b/app/Models/PaymentTransaction.php
@@ -20,6 +20,8 @@ class PaymentTransaction extends BaseModel
         'payment_method',
         'payment_status',
         'transaction_fee',
+        'payment_reference',
+        'is_full_payment',
         'school_year',
         'semester',
     ];
@@ -91,4 +93,4 @@ class PaymentTransaction extends BaseModel
             ->orderByDesc('transaction_date')
             ->first();
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Administrator/AdministratorEnrollmentStatusService.php b/app/Services/Administrator/AdministratorEnrollmentStatusService.php
index f111a93d..cda49b10 100644
--- a/app/Services/Administrator/AdministratorEnrollmentStatusService.php
+++ b/app/Services/Administrator/AdministratorEnrollmentStatusService.php
@@ -23,8 +23,6 @@ class AdministratorEnrollmentStatusService
         $schoolYear = $this->shared->getSchoolYear();
         $semester = $this->shared->getSemester();
 
-        DB::beginTransaction();
-
         try {
             if (empty($enrollmentStatuses)) {
                 return [
@@ -34,6 +32,8 @@ class AdministratorEnrollmentStatusService
                 ];
             }
 
+            DB::beginTransaction();
+
             $errors = [];
             $groupsByParentStatus = [];
             $parentInfo = [];
@@ -270,4 +270,4 @@ class AdministratorEnrollmentStatusService
             'lastname' => $parentData['lastname'] ?? '',
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/Assignment/AssignmentContextService.php b/app/Services/Assignment/AssignmentContextService.php
new file mode 100644
index 00000000..11f2c9ce
--- /dev/null
+++ b/app/Services/Assignment/AssignmentContextService.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Services\Assignment;
+
+use App\Models\Configuration;
+
+class AssignmentContextService
+{
+    public function __construct(private Configuration $configuration) {}
+
+    public function getCurrentSemester(): string
+    {
+        return (string) ($this->getConfigValue('semester') ?? '');
+    }
+
+    public function getCurrentSchoolYear(): string
+    {
+        return (string) ($this->getConfigValue('school_year') ?? '');
+    }
+
+    private function getConfigValue(string $key): mixed
+    {
+        return $this->configuration
+            ->newQuery()
+            ->where('config_key', $key)
+            ->value('config_value');
+    }
+}
diff --git a/app/Services/Assignment/AssignmentDataLoaderService.php b/app/Services/Assignment/AssignmentDataLoaderService.php
new file mode 100644
index 00000000..df8f5219
--- /dev/null
+++ b/app/Services/Assignment/AssignmentDataLoaderService.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Services\Assignment;
+
+use App\Models\StudentClass;
+use App\Models\TeacherClass;
+use Illuminate\Support\Collection;
+
+class AssignmentDataLoaderService
+{
+    public function __construct(
+        private TeacherClass $teacherClass,
+        private StudentClass $studentClass
+    ) {}
+
+    public function loadTeacherClasses(?string $schoolYear = null): Collection
+    {
+        return $this->teacherClass
+            ->newQuery()
+            ->with([
+                'teacher:id,firstname,lastname',
+            ])
+            ->when(filled($schoolYear), fn ($q) => $q->where('school_year', $schoolYear))
+            ->get()
+            ->map(function ($row) {
+                $row->teacher_full_name = trim(
+                    ((string) optional($row->teacher)->firstname) . ' ' .
+                    ((string) optional($row->teacher)->lastname)
+                );
+
+                return $row;
+            });
+    }
+
+    public function loadStudentClasses(?string $schoolYear = null): Collection
+    {
+        return $this->studentClass
+            ->newQuery()
+            ->with([
+                'student:id,firstname,lastname,age,gender,registration_grade,photo_consent,tuition_paid,school_id,is_active',
+            ])
+            ->whereHas('student', fn ($q) => $q->where('is_active', 1))
+            ->when(filled($schoolYear), fn ($q) => $q->where('school_year', $schoolYear))
+            ->get();
+    }
+}
diff --git a/app/Services/Assignment/AssignmentMetaService.php b/app/Services/Assignment/AssignmentMetaService.php
new file mode 100644
index 00000000..f06410dd
--- /dev/null
+++ b/app/Services/Assignment/AssignmentMetaService.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Services\Assignment;
+
+use Illuminate\Support\Facades\DB;
+
+class AssignmentMetaService
+{
+    public function getSchoolYears(string $fallbackYear = ''): array
+    {
+        $years = DB::table('teacher_class')
+            ->selectRaw('DISTINCT school_year')
+            ->whereNotNull('school_year')
+            ->orderByDesc('school_year')
+            ->pluck('school_year')
+            ->map(fn ($year) => (string) $year)
+            ->filter()
+            ->values()
+            ->all();
+
+        if (empty($years) && $fallbackYear !== '') {
+            $years[] = $fallbackYear;
+        }
+
+        return $years;
+    }
+
+    public function firstNonEmpty(array $values): mixed
+    {
+        foreach ($values as $value) {
+            if (filled($value)) {
+                return $value;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/app/Services/Assignment/AssignmentSectionService.php b/app/Services/Assignment/AssignmentSectionService.php
new file mode 100644
index 00000000..a30ef208
--- /dev/null
+++ b/app/Services/Assignment/AssignmentSectionService.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Services\Assignment;
+
+use App\Models\ClassSection;
+
+class AssignmentSectionService
+{
+    public function __construct(private ClassSection $classSection) {}
+
+    public function getSectionNamesMap(array $sectionIds): array
+    {
+        if (empty($sectionIds)) {
+            return [];
+        }
+
+        return $this->classSection
+            ->newQuery()
+            ->whereIn('id', $sectionIds)
+            ->get()
+            ->mapWithKeys(function ($section) {
+                $name = $section->class_section_name ?? $section->section_name ?? $section->name ?? '';
+                return [(int) $section->id => (string) $name];
+            })
+            ->all();
+    }
+}
diff --git a/app/Services/Assignment/AssignmentService.php b/app/Services/Assignment/AssignmentService.php
index 969abaf1..8e03f5a7 100644
--- a/app/Services/Assignment/AssignmentService.php
+++ b/app/Services/Assignment/AssignmentService.php
@@ -2,38 +2,26 @@
 
 namespace App\Services\Assignment;
 
-use App\Models\ClassSection;
-use App\Models\Configuration;
 use App\Models\StudentClass;
-use App\Models\TeacherClass;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 
 class AssignmentService
 {
     public function __construct(
-        protected Configuration $configurationModel,
-        protected TeacherClass $teacherClassModel,
         protected StudentClass $studentClassModel,
-        protected ClassSection $classSectionModel,
+        protected AssignmentContextService $contextService,
+        protected AssignmentDataLoaderService $dataLoader,
+        protected AssignmentSectionService $sectionService,
+        protected AssignmentMetaService $metaService
     ) {}
 
     public function getCurrentSemester(): string
     {
-        return (string) ($this->getConfigValue('semester') ?? '');
+        return $this->contextService->getCurrentSemester();
     }
 
     public function getCurrentSchoolYear(): string
     {
-        return (string) ($this->getConfigValue('school_year') ?? '');
-    }
-
-    protected function getConfigValue(string $key): mixed
-    {
-        return $this->configurationModel
-            ->newQuery()
-            ->where('config_key', $key)
-            ->value('config_value');
+        return $this->contextService->getCurrentSchoolYear();
     }
 
     public function getAssignmentsOverview(?string $schoolYear = null, ?string $semester = null): array
@@ -44,8 +32,8 @@ class AssignmentService
         $selectedSemester = (string) ($semester ?? $currentSemester);
         $selectedYear = (string) ($schoolYear ?? $currentSchoolYear);
 
-        $teacherClasses = $this->loadTeacherClasses($selectedYear);
-        $studentClasses = $this->loadStudentClasses($selectedYear);
+        $teacherClasses = $this->dataLoader->loadTeacherClasses($selectedYear);
+        $studentClasses = $this->dataLoader->loadStudentClasses($selectedYear);
 
         $teacherBySection = $teacherClasses->groupBy('class_section_id');
         $studentBySection = $studentClasses->groupBy('class_section_id');
@@ -56,7 +44,7 @@ class AssignmentService
             ->filter()
             ->values();
 
-        $sectionNames = $this->getSectionNamesMap($allSectionIds->all());
+        $sectionNames = $this->sectionService->getSectionNamesMap($allSectionIds->all());
 
         $classSections = $allSectionIds->map(function ($sectionId) use (
             $teacherBySection,
@@ -86,19 +74,19 @@ class AssignmentService
                 ->unique()
                 ->values();
 
-            $semesterMeta = $this->firstNonEmpty([
+            $semesterMeta = $this->metaService->firstNonEmpty([
                 $teacherRows->pluck('semester')->first(fn ($v) => filled($v)),
                 $studentRows->pluck('semester')->first(fn ($v) => filled($v)),
                 $currentSemester,
             ]);
 
-            $schoolYearMeta = $this->firstNonEmpty([
+            $schoolYearMeta = $this->metaService->firstNonEmpty([
                 $teacherRows->pluck('school_year')->first(fn ($v) => filled($v)),
                 $studentRows->pluck('school_year')->first(fn ($v) => filled($v)),
                 $currentSchoolYear,
             ]);
 
-            $descriptionMeta = $this->firstNonEmpty([
+            $descriptionMeta = $this->metaService->firstNonEmpty([
                 $teacherRows->pluck('description')->first(fn ($v) => filled($v)),
                 $studentRows->pluck('description')->first(fn ($v) => filled($v)),
                 '',
@@ -141,7 +129,7 @@ class AssignmentService
 
         return [
             'classSections' => $classSections,
-            'schoolYears' => $this->getSchoolYears($currentSchoolYear),
+            'schoolYears' => $this->metaService->getSchoolYears($currentSchoolYear),
             'schoolYear' => $selectedYear,
             'selectedYear' => $selectedYear,
             'selectedSemester' => $selectedSemester,
@@ -171,8 +159,8 @@ class AssignmentService
         $currentSemester = $this->getCurrentSemester();
         $currentSchoolYear = $this->getCurrentSchoolYear();
 
-        $teacherClasses = $this->loadTeacherClasses();
-        $studentClasses = $this->loadStudentClasses();
+        $teacherClasses = $this->dataLoader->loadTeacherClasses();
+        $studentClasses = $this->dataLoader->loadStudentClasses();
 
         $teacherBySection = $teacherClasses->groupBy('class_section_id');
         $studentBySection = $studentClasses->groupBy('class_section_id');
@@ -183,7 +171,7 @@ class AssignmentService
             ->filter()
             ->values();
 
-        $sectionNames = $this->getSectionNamesMap($allSectionIds->all());
+        $sectionNames = $this->sectionService->getSectionNamesMap($allSectionIds->all());
 
         $classSections = $allSectionIds->map(function ($sectionId) use (
             $teacherBySection,
@@ -213,19 +201,19 @@ class AssignmentService
                 ->unique()
                 ->values();
 
-            $semesterMeta = $this->firstNonEmpty([
+            $semesterMeta = $this->metaService->firstNonEmpty([
                 $teacherRows->pluck('semester')->first(fn ($v) => filled($v)),
                 $studentRows->pluck('semester')->first(fn ($v) => filled($v)),
                 $currentSemester,
             ]);
 
-            $schoolYearMeta = $this->firstNonEmpty([
+            $schoolYearMeta = $this->metaService->firstNonEmpty([
                 $teacherRows->pluck('school_year')->first(fn ($v) => filled($v)),
                 $studentRows->pluck('school_year')->first(fn ($v) => filled($v)),
                 $currentSchoolYear,
             ]);
 
-            $descriptionMeta = $this->firstNonEmpty([
+            $descriptionMeta = $this->metaService->firstNonEmpty([
                 $teacherRows->pluck('description')->first(fn ($v) => filled($v)),
                 $studentRows->pluck('description')->first(fn ($v) => filled($v)),
                 '',
@@ -272,82 +260,4 @@ class AssignmentService
             'school_year' => $currentSchoolYear,
         ];
     }
-
-    protected function loadTeacherClasses(?string $schoolYear = null): Collection
-    {
-        return $this->teacherClassModel
-            ->newQuery()
-            ->with([
-                'teacher:id,firstname,lastname',
-            ])
-            ->when(filled($schoolYear), fn ($q) => $q->where('school_year', $schoolYear))
-            ->get()
-            ->map(function ($row) {
-                $row->teacher_full_name = trim(
-                    ((string) optional($row->teacher)->firstname) . ' ' .
-                    ((string) optional($row->teacher)->lastname)
-                );
-
-                return $row;
-            });
-    }
-
-    protected function loadStudentClasses(?string $schoolYear = null): Collection
-    {
-        return $this->studentClassModel
-            ->newQuery()
-            ->with([
-                'student:id,firstname,lastname,age,gender,registration_grade,photo_consent,tuition_paid,school_id,is_active',
-            ])
-            ->whereHas('student', fn ($q) => $q->where('is_active', 1))
-            ->when(filled($schoolYear), fn ($q) => $q->where('school_year', $schoolYear))
-            ->get();
-    }
-
-    protected function getSectionNamesMap(array $sectionIds): array
-    {
-        if (empty($sectionIds)) {
-            return [];
-        }
-
-        return $this->classSectionModel
-            ->newQuery()
-            ->whereIn('id', $sectionIds)
-            ->get()
-            ->mapWithKeys(function ($section) {
-                $name = $section->section_name ?? $section->name ?? '';
-                return [(int) $section->id => (string) $name];
-            })
-            ->all();
-    }
-
-    protected function getSchoolYears(string $fallbackYear = ''): array
-    {
-        $years = DB::table('teacher_class')
-            ->selectRaw('DISTINCT school_year')
-            ->whereNotNull('school_year')
-            ->orderByDesc('school_year')
-            ->pluck('school_year')
-            ->map(fn ($year) => (string) $year)
-            ->filter()
-            ->values()
-            ->all();
-
-        if (empty($years) && $fallbackYear !== '') {
-            $years[] = $fallbackYear;
-        }
-
-        return $years;
-    }
-
-    protected function firstNonEmpty(array $values): mixed
-    {
-        foreach ($values as $value) {
-            if (filled($value)) {
-                return $value;
-            }
-        }
-
-        return null;
-    }
 }
diff --git a/app/Services/AttendanceTracking/AttendanceTrackingService.php b/app/Services/AttendanceTracking/AttendanceTrackingService.php
index 07d27696..4995372b 100644
--- a/app/Services/AttendanceTracking/AttendanceTrackingService.php
+++ b/app/Services/AttendanceTracking/AttendanceTrackingService.php
@@ -2,179 +2,6 @@
 
 namespace App\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Models\AttendanceTracking;
-use App\Models\Configuration;
-use App\Models\Student;
-use App\Models\StudentClass;
-use Carbon\Carbon;
-
 class AttendanceTrackingService
 {
-    protected string $semester;
-    protected string $schoolYear;
-
-    public function __construct(
-        protected Student $studentModel,
-        protected StudentClass $studentClassModel,
-        protected AttendanceData $attendanceDataModel,
-        protected AttendanceTracking $attendanceTrackingModel,
-        protected Configuration $configModel,
-        protected AttendanceMailerService $attendanceMailerService,
-        protected ViolationRuleEngineService $violationRuleEngine,
-        protected AttendanceParentLookupService $parentLookupService,
-        protected AttendanceEmailComposerService $emailComposerService,
-        protected AttendanceNotificationLogService $notificationLogService,
-        protected AttendanceViolationStudentResolverService $studentResolverService,
-        protected AttendanceCaseQueryService $attendanceCaseQueryService,
-        protected AttendanceNotificationWorkflowService $attendanceNotificationWorkflowService,
-        protected AttendanceCommunicationSupportService $attendanceCommunicationSupportService,
-        protected AttendancePendingViolationService $attendancePendingViolationService
-    ) {
-        $this->semester   = (string) ($this->configModel->getConfig('semester') ?? '');
-        $this->schoolYear = (string) ($this->configModel->getConfig('school_year') ?? '');
-    }
-
-    public function getPendingViolations(?string $schoolYearParam = null, ?string $semesterParam = null): array
-    {
-        return $this->attendancePendingViolationService->getPendingViolations(
-            $this->schoolYear,
-            $schoolYearParam,
-            $semesterParam
-        );
-    }
-
-    public function getStudentCase(
-        int $studentId,
-        ?string $codeParam = null,
-        ?string $incidentDate = null,
-        bool $includeNotified = false,
-        bool $pendingOnly = false,
-        ?string $schoolYearFilter = null,
-        ?string $semesterFilter = null
-    ): array {
-        return $this->attendanceCaseQueryService->getStudentCase(
-            $studentId,
-            $codeParam,
-            $incidentDate,
-            $includeNotified,
-            $pendingOnly,
-            $schoolYearFilter,
-            $semesterFilter,
-            $this->schoolYear,
-            $this->semester
-        );
-    }
-
-    public function getNotifiedViolations(?string $schoolYearParam = null, ?string $semesterParam = null): array
-    {
-        return $this->attendanceCaseQueryService->getNotifiedViolations(
-            $schoolYearParam,
-            $semesterParam,
-            $this->schoolYear,
-            $this->semester
-        );
-    }
-
-    public function compose(
-        int $studentId,
-        string $code = 'ABS_1',
-        string $variant = 'default',
-        ?string $incidentDate = null
-    ): array {
-        return $this->attendanceCommunicationSupportService->compose(
-            $studentId,
-            $code,
-            $variant,
-            $incidentDate
-        );
-    }
-
-    public function parentsInfo(int $studentId): array
-    {
-        return $this->attendanceCommunicationSupportService->parentsInfo($studentId);
-    }
-
-    public function record(array $data): array
-    {
-        return $this->attendanceNotificationWorkflowService->record($data);
-    }
-
-    public function sendAutoEmails(?string $variantOverride = null): array
-    {
-        $classStudentsQuery = $this->studentClassModel->query();
-        if (method_exists($this->studentClassModel, 'scopeActive')) {
-            $classStudentsQuery->active();
-        }
-
-        $classStudents = $classStudentsQuery
-            ->where('school_year', $this->schoolYear)
-            ->get()
-            ->toArray();
-
-        if (empty($classStudents)) {
-            return [
-                'success' => true,
-                'sent'    => 0,
-                'skipped' => 0,
-                'errors'  => 0,
-                'details' => [],
-            ];
-        }
-
-        $studentIds = array_column($classStudents, 'student_id');
-
-        $students = $this->studentModel->query()
-            ->whereIn('id', $studentIds)
-            ->where('is_active', 1)
-            ->get()
-            ->toArray();
-
-        $attendanceQuery = $this->attendanceDataModel->query()
-            ->whereIn('student_id', $studentIds)
-            ->where('school_year', $this->schoolYear)
-            ->where('date', '>=', Carbon::today()->subWeeks(5)->format('Y-m-d'));
-
-        $this->violationRuleEngine->applyUnreportedAttendanceFilter(
-            $attendanceQuery,
-            $this->attendanceDataModel->getTable()
-        );
-
-        $attendanceData = $attendanceQuery
-            ->whereRaw("LOWER(TRIM(status)) IN ('absent','late')")
-            ->orderByDesc('date')
-            ->get()
-            ->toArray();
-
-        $violations = $this->violationRuleEngine->computeViolations(
-            $students,
-            $attendanceData,
-            $this->schoolYear,
-            null,
-            $attendanceData
-        );
-
-        return $this->attendanceNotificationWorkflowService->sendAutoEmails($violations, $variantOverride);
-    }
-
-    public function sendEmailManual(array $data): array
-    {
-        $sid = (int) $data['student_id'];
-        $code = (string) $data['code'];
-        $ymdRaw = (string) ($data['incident_date'] ?? '');
-        $ymd = $ymdRaw !== '' ? substr($ymdRaw, 0, 10) : '';
-
-        $violationDates = $this->attendanceCommunicationSupportService->getViolationDatesForStudent(
-            $sid,
-            $code,
-            $ymd
-        );
-
-        return $this->attendanceNotificationWorkflowService->sendEmailManual($data, $violationDates);
-    }
-
-    public function saveNotificationNote(array $data): array
-    {
-        return $this->attendanceNotificationWorkflowService->saveNotificationNote($data);
-    }
-}
\ No newline at end of file
+}
diff --git a/app/Services/AttendanceTrackingService.php b/app/Services/AttendanceTrackingService.php
deleted file mode 100644
index d975e50e..00000000
--- a/app/Services/AttendanceTrackingService.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Services\AttendanceTracking\AttendanceTrackingService as CoreService;
-
-class AttendanceTrackingService extends CoreService
-{
-}
diff --git a/app/Services/Auth/RegistrationCaptchaService.php b/app/Services/Auth/RegistrationCaptchaService.php
new file mode 100644
index 00000000..47c79924
--- /dev/null
+++ b/app/Services/Auth/RegistrationCaptchaService.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Services\Auth;
+
+class RegistrationCaptchaService
+{
+    public function generate(?int $length = null): string
+    {
+        $length = $length ?? random_int(4, 8);
+        $characters = 'ABCDEFGHJKLMNOPQRSTUVWXYZabcdefghjkmnopqrstuvwxyz0123456789';
+        $captchaText = '';
+
+        for ($i = 0; $i < $length; $i++) {
+            $captchaText .= $characters[random_int(0, strlen($characters) - 1)];
+        }
+
+        session()->put('captcha_answer', $captchaText);
+
+        return $captchaText;
+    }
+
+    public function verify(string $input): bool
+    {
+        $expected = (string) session()->get('captcha_answer', '');
+        if ($expected === '') {
+            return false;
+        }
+
+        return hash_equals($expected, $input);
+    }
+
+    public function clear(): void
+    {
+        session()->forget('captcha_answer');
+    }
+}
diff --git a/app/Services/Auth/RegistrationFormatterService.php b/app/Services/Auth/RegistrationFormatterService.php
new file mode 100644
index 00000000..3d00572e
--- /dev/null
+++ b/app/Services/Auth/RegistrationFormatterService.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Services\Auth;
+
+use App\Services\PhoneFormatterService;
+
+class RegistrationFormatterService
+{
+    public function __construct(private PhoneFormatterService $phoneFormatter)
+    {
+    }
+
+    public function format(array $payload): array
+    {
+        $g = static function (string $key) use ($payload): string {
+            return trim((string) ($payload[$key] ?? ''));
+        };
+
+        $data = [
+            'firstname' => $this->formatName($g('firstname')),
+            'lastname' => $this->formatName($g('lastname')),
+            'email' => $this->formatEmail($g('email')),
+            'gender' => $g('gender'),
+            'city' => $this->formatName($g('city')),
+            'cellphone' => $this->phoneFormatter->formatPhoneNumber($g('cellphone')),
+            'address_street' => $this->formatAddress($g('address_street')),
+            'apt' => strtoupper($g('apt')),
+            'state' => strtoupper($g('state')),
+            'zip' => $g('zip'),
+            'accept_school_policy' => (int) ($payload['accept_school_policy'] ?? 0),
+        ];
+
+        $noSecondInfo = !empty($payload['no_second_parent_info']);
+
+        $secondFirstname = $this->formatName($g('second_firstname'));
+        $secondLastname = $this->formatName($g('second_lastname'));
+        $secondGender = $g('second_gender');
+        $secondEmail = $this->formatEmail($g('second_email'));
+        $secondCellphone = $this->phoneFormatter->formatPhoneNumber($g('second_cellphone'));
+
+        $secondProvided = !$noSecondInfo && (
+            $secondFirstname !== '' ||
+            $secondLastname !== '' ||
+            $secondGender !== '' ||
+            $secondEmail !== '' ||
+            preg_replace('/\D/', '', (string) $secondCellphone) !== ''
+        );
+
+        if ($secondProvided) {
+            $data['second_firstname'] = $secondFirstname;
+            $data['second_lastname'] = $secondLastname;
+            $data['second_gender'] = $secondGender;
+            $data['second_email'] = $secondEmail;
+            $data['second_cellphone'] = $secondCellphone;
+        }
+
+        return $data;
+    }
+
+    private function formatName(string $name): string
+    {
+        $name = trim($name);
+        if ($name === '') {
+            return '';
+        }
+
+        return ucwords(strtolower($name), " -");
+    }
+
+    private function formatEmail(string $email): string
+    {
+        return strtolower(trim($email));
+    }
+
+    private function formatAddress(string $address): string
+    {
+        $address = trim($address);
+        if ($address === '') {
+            return '';
+        }
+
+        return ucwords(strtolower($address));
+    }
+}
diff --git a/app/Services/Auth/RegistrationService.php b/app/Services/Auth/RegistrationService.php
new file mode 100644
index 00000000..4db45a72
--- /dev/null
+++ b/app/Services/Auth/RegistrationService.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Services\Auth;
+
+use App\Models\Configuration;
+use App\Models\ParentModel;
+use App\Models\Role;
+use App\Models\User;
+use App\Models\UserRole;
+use App\Services\EmailService;
+use App\Services\SchoolIdService;
+use Illuminate\Support\Facades\DB;
+
+class RegistrationService
+{
+    public function __construct(
+        private EmailService $emailService,
+        private SchoolIdService $schoolIdService,
+        private RegistrationFormatterService $formatter,
+        private RegistrationCaptchaService $captchaService
+    ) {
+    }
+
+    public function register(array $payload): array
+    {
+        $captcha = (string) ($payload['captcha'] ?? '');
+        if (!$this->captchaService->verify($captcha)) {
+            return [
+                'ok' => false,
+                'code' => 'captcha_invalid',
+                'message' => 'Incorrect CAPTCHA answer. Please try again.',
+            ];
+        }
+
+        $isParent = !empty($payload['is_parent']);
+        $noSecondInfo = !empty($payload['no_second_parent_info']);
+
+        $formatted = $this->formatter->format($payload);
+        $email = (string) ($formatted['email'] ?? '');
+
+        $existing = User::query()->where('email', $email)->first();
+        if ($existing) {
+            $pending = !empty($existing->token) && (int) ($existing->is_verified ?? 0) === 0;
+            if ($pending) {
+                return [
+                    'ok' => false,
+                    'code' => 'pending_activation',
+                    'message' => 'This email address is already registered and pending activation.',
+                ];
+            }
+
+            return [
+                'ok' => false,
+                'code' => 'email_exists',
+                'message' => 'The email address you entered is already in use.',
+            ];
+        }
+
+        $roleName = $isParent ? 'parent' : 'guest';
+        $role = Role::query()->where('name', $roleName)->first();
+        if (!$role) {
+            return [
+                'ok' => false,
+                'code' => 'role_missing',
+                'message' => 'Role not found.',
+            ];
+        }
+
+        $token = bin2hex(random_bytes(48));
+        $schoolYear = Configuration::getConfig('school_year');
+        $semester = Configuration::getConfig('semester');
+
+        $userData = [
+            'firstname' => (string) ($formatted['firstname'] ?? ''),
+            'lastname' => (string) ($formatted['lastname'] ?? ''),
+            'gender' => (string) ($formatted['gender'] ?? ''),
+            'email' => $email,
+            'cellphone' => (string) ($formatted['cellphone'] ?? ($payload['cellphone'] ?? '')),
+            'address_street' => (string) ($formatted['address_street'] ?? ''),
+            'apt' => $formatted['apt'] ?? null,
+            'city' => (string) ($formatted['city'] ?? ''),
+            'state' => (string) ($formatted['state'] ?? ''),
+            'zip' => (string) ($formatted['zip'] ?? ''),
+            'token' => $token,
+            'is_verified' => 0,
+            'accept_school_policy' => (int) ($formatted['accept_school_policy'] ?? 0),
+            'status' => 'Inactive',
+            'school_id' => $this->schoolIdService->generateUserSchoolId(),
+            'semester' => (string) ($semester ?? ''),
+            'school_year' => $schoolYear,
+            'password' => pbkdf2_hash(bin2hex(random_bytes(8))),
+        ];
+
+        $user = null;
+
+        DB::transaction(function () use (
+            $userData,
+            $role,
+            $isParent,
+            $noSecondInfo,
+            $formatted,
+            $schoolYear,
+            $semester,
+            &$user
+        ) {
+            $user = User::query()->create($userData);
+
+            UserRole::query()->create([
+                'user_id' => (int) $user->id,
+                'role_id' => (int) $role->id,
+                'created_at' => now(),
+            ]);
+
+            if ($isParent && !$noSecondInfo && !empty($formatted['second_firstname'])) {
+                ParentModel::query()->create([
+                    'secondparent_firstname' => $formatted['second_firstname'] ?? null,
+                    'secondparent_lastname' => $formatted['second_lastname'] ?? null,
+                    'secondparent_gender' => $formatted['second_gender'] ?? null,
+                    'secondparent_email' => $formatted['second_email'] ?? null,
+                    'secondparent_phone' => $formatted['second_cellphone'] ?? null,
+                    'firstparent_id' => (int) $user->id,
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                ]);
+            }
+        });
+
+        $activationLink = url('/user/confirm/' . $token);
+        $recipientName = trim((string) ($formatted['firstname'] ?? '') . ' ' . (string) ($formatted['lastname'] ?? ''));
+
+        $emailData = [
+            'recipientName' => $recipientName,
+            'activationLink' => $activationLink,
+            'orgName' => 'Al Rahma Sunday School',
+            'contactInfo' => 'alrahma.isgl@gmail.com',
+            'logoUrl' => 'https://alrahmaisgl.org/assets/images/alrahma_logo.png',
+            'subject' => 'Email Confirmation',
+        ];
+
+        if (view()->exists($isParent ? 'emails.welcome_parent' : 'emails.welcome_staff')) {
+            $html = view($isParent ? 'emails.welcome_parent' : 'emails.welcome_staff', $emailData);
+        } else {
+            $html = '<p>Hello ' . e($recipientName !== '' ? $recipientName : 'there') . ',</p>'
+                . '<p>Please confirm your email by clicking the link below:</p>'
+                . '<p><a href="' . e($activationLink) . '">Activate your account</a></p>'
+                . '<p>Thank you.</p>';
+        }
+
+        $sent = $this->emailService->send($email, 'Email Confirmation', $html, 'general');
+        $this->captchaService->clear();
+
+        return [
+            'ok' => true,
+            'user' => $user,
+            'role' => $roleName,
+            'activation_sent' => $sent,
+        ];
+    }
+}
diff --git a/app/Services/BroadcastEmail/BroadcastEmailComposerService.php b/app/Services/BroadcastEmail/BroadcastEmailComposerService.php
new file mode 100644
index 00000000..538e2719
--- /dev/null
+++ b/app/Services/BroadcastEmail/BroadcastEmailComposerService.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Services\BroadcastEmail;
+
+use Illuminate\Support\Facades\View;
+
+class BroadcastEmailComposerService
+{
+    public function sanitizeHtml(string $html): string
+    {
+        $html = preg_replace('#<(script|iframe)[^>]*>.*?</\\1>#is', '', $html);
+        $html = preg_replace('/\\son\\w+="[^"]*"/i', '', $html);
+        $html = preg_replace("/\\son\\w+='[^']*'/i", '', $html);
+        return $html ?? '';
+    }
+
+    public function compose(
+        bool $wrapLayout,
+        string $subject,
+        string $body,
+        string $recipientName,
+        string $preheader = '',
+        string $ctaText = '',
+        string $ctaUrl = '',
+        bool $personalize = true
+    ): string {
+        $content = $personalize ? str_replace('{{name}}', $recipientName, $body) : $body;
+
+        if (!$wrapLayout) {
+            return $content;
+        }
+
+        if (!View::exists('emails.broadcast_wrapper')) {
+            return $content;
+        }
+
+        return view('emails.broadcast_wrapper', [
+            'subject' => $subject,
+            'content' => $content,
+            'preheader' => $preheader,
+            'cta_text' => $ctaText,
+            'cta_url' => $ctaUrl,
+        ])->render();
+    }
+}
diff --git a/app/Services/BroadcastEmail/BroadcastEmailDispatchService.php b/app/Services/BroadcastEmail/BroadcastEmailDispatchService.php
new file mode 100644
index 00000000..5962317c
--- /dev/null
+++ b/app/Services/BroadcastEmail/BroadcastEmailDispatchService.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Services\BroadcastEmail;
+
+use App\Services\EmailService;
+
+class BroadcastEmailDispatchService
+{
+    private EmailService $mailer;
+    private BroadcastEmailComposerService $composer;
+
+    public function __construct(EmailService $mailer, BroadcastEmailComposerService $composer)
+    {
+        $this->mailer = $mailer;
+        $this->composer = $composer;
+    }
+
+    public function sendTest(array $payload): array
+    {
+        $html = $this->composer->compose(
+            (bool) $payload['wrap_layout'],
+            $payload['subject'],
+            $payload['body_html'],
+            $payload['recipient_name'],
+            $payload['preheader'],
+            $payload['cta_text'],
+            $payload['cta_url'],
+            (bool) $payload['personalize']
+        );
+
+        $ok = $this->mailer->send(
+            $payload['test_email'],
+            '[TEST] ' . $payload['subject'],
+            $html,
+            $payload['from_key']
+        );
+
+        return [
+            'ok' => $ok,
+            'message' => $ok
+                ? "Test email sent to {$payload['test_email']}."
+                : 'Test email failed (mailer->send() returned false). Check logs.',
+        ];
+    }
+
+    public function sendBroadcast(array $payload, array $recipients): array
+    {
+        $stats = [
+            'attempted' => 0,
+            'sent' => 0,
+            'failed' => 0,
+            'mode' => $payload['mode'],
+        ];
+
+        foreach ($recipients as $recipient) {
+            $stats['attempted']++;
+            $recipientName = $recipient['name'] ?: 'Parent';
+            $html = $this->composer->compose(
+                (bool) $payload['wrap_layout'],
+                $payload['subject'],
+                $payload['body_html'],
+                $recipientName,
+                $payload['preheader'],
+                $payload['cta_text'],
+                $payload['cta_url'],
+                (bool) $payload['personalize']
+            );
+
+            $ok = $this->mailer->send(
+                (string) $recipient['email'],
+                $payload['subject'],
+                $html,
+                $payload['from_key']
+            );
+
+            $ok ? $stats['sent']++ : $stats['failed']++;
+        }
+
+        return $stats;
+    }
+}
diff --git a/app/Services/BroadcastEmail/BroadcastEmailImageService.php b/app/Services/BroadcastEmail/BroadcastEmailImageService.php
new file mode 100644
index 00000000..8e1a0b5f
--- /dev/null
+++ b/app/Services/BroadcastEmail/BroadcastEmailImageService.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Services\BroadcastEmail;
+
+use Illuminate\Http\UploadedFile;
+
+class BroadcastEmailImageService
+{
+    private const MAX_SIZE_BYTES = 5242880;
+
+    private array $allowedTypes = [
+        'image/jpeg' => 'jpg',
+        'image/png' => 'png',
+        'image/gif' => 'gif',
+        'image/webp' => 'webp',
+    ];
+
+    public function store(UploadedFile $file): array
+    {
+        $mime = strtolower((string) $file->getMimeType());
+        if (!isset($this->allowedTypes[$mime])) {
+            return [
+                'ok' => false,
+                'status' => 415,
+                'error' => 'Unsupported image type',
+            ];
+        }
+
+        if ($file->getSize() > self::MAX_SIZE_BYTES) {
+            return [
+                'ok' => false,
+                'status' => 413,
+                'error' => 'Image too large (max 5MB)',
+            ];
+        }
+
+        $targetDir = public_path('uploads/email');
+        if (!is_dir($targetDir)) {
+            @mkdir($targetDir, 0755, true);
+        }
+
+        $ext = $this->allowedTypes[$mime];
+        $newName = uniqid('em_', true) . '.' . $ext;
+        $file->move($targetDir, $newName);
+
+        return [
+            'ok' => true,
+            'url' => asset('uploads/email/' . $newName),
+        ];
+    }
+}
diff --git a/app/Services/BroadcastEmail/BroadcastEmailRecipientService.php b/app/Services/BroadcastEmail/BroadcastEmailRecipientService.php
new file mode 100644
index 00000000..0649ef0a
--- /dev/null
+++ b/app/Services/BroadcastEmail/BroadcastEmailRecipientService.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Services\BroadcastEmail;
+
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class BroadcastEmailRecipientService
+{
+    public function parentsWithEmails(): array
+    {
+        $parents = User::getParents();
+
+        return array_values(array_filter($parents, static function ($parent) {
+            $email = $parent['email'] ?? '';
+            return is_string($email) && trim($email) !== '';
+        }));
+    }
+
+    public function recipientsByIds(array $ids): array
+    {
+        $ids = array_values(array_unique(array_filter(array_map('intval', $ids))));
+        if (empty($ids)) {
+            return [];
+        }
+
+        return DB::table('users')
+            ->select('users.id', 'users.email', DB::raw('CONCAT(users.firstname, " ", users.lastname) AS name'))
+            ->whereIn('users.id', $ids)
+            ->whereNotNull('users.email')
+            ->where('users.email', '!=', '')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+}
diff --git a/app/Services/BroadcastEmail/BroadcastEmailSenderOptionsService.php b/app/Services/BroadcastEmail/BroadcastEmailSenderOptionsService.php
new file mode 100644
index 00000000..0a39cae1
--- /dev/null
+++ b/app/Services/BroadcastEmail/BroadcastEmailSenderOptionsService.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services\BroadcastEmail;
+
+class BroadcastEmailSenderOptionsService
+{
+    public function listOptions(): array
+    {
+        $json = env('MAIL_SENDERS', '{}');
+        $arr = json_decode($json, true);
+
+        if (!is_array($arr) || empty($arr)) {
+            $smtpUser = getenv('SMTP_USER') ?: '';
+            $name = 'Al Rahma Sunday School';
+            return [[
+                'key' => 'general',
+                'label' => $name . ($smtpUser ? " <{$smtpUser}>" : ''),
+            ]];
+        }
+
+        $out = [];
+        foreach ($arr as $key => $info) {
+            $name = $info['name'] ?? 'Sender';
+            $email = $info['email'] ?? '';
+            $out[] = [
+                'key' => (string) $key,
+                'label' => trim($name . ($email ? " <{$email}>" : '')),
+            ];
+        }
+
+        return $out;
+    }
+}
diff --git a/app/Services/ClassPrep/ClassRosterService.php b/app/Services/ClassPrep/ClassRosterService.php
new file mode 100644
index 00000000..163ac3b4
--- /dev/null
+++ b/app/Services/ClassPrep/ClassRosterService.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Services\ClassPrep;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+
+class ClassRosterService
+{
+    public function listStudentsByClass(int $classSectionId, ?string $schoolYear = null): array
+    {
+        $schoolYear = $schoolYear && trim($schoolYear) !== ''
+            ? $schoolYear
+            : (string) Configuration::getConfig('school_year');
+
+        return DB::table('students')
+            ->select(
+                'students.id',
+                'students.firstname',
+                'students.lastname',
+                'students.gender',
+                'cs.class_section_name AS registration_grade'
+            )
+            ->join('student_class as sc', 'sc.student_id', '=', 'students.id')
+            ->join('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->where('sc.school_year', $schoolYear)
+            ->where('sc.class_section_id', $classSectionId)
+            ->groupBy(
+                'students.id',
+                'students.firstname',
+                'students.lastname',
+                'students.gender',
+                'cs.class_section_name'
+            )
+            ->orderBy('students.firstname', 'ASC')
+            ->orderBy('students.lastname', 'ASC')
+            ->limit(1000)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->toArray();
+    }
+}
diff --git a/app/Services/ClassPrep/StickerCountService.php b/app/Services/ClassPrep/StickerCountService.php
new file mode 100644
index 00000000..288e58e5
--- /dev/null
+++ b/app/Services/ClassPrep/StickerCountService.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace App\Services\ClassPrep;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+
+class StickerCountService
+{
+    public function listAll(?string $schoolYear = null, ?string $semester = null): array
+    {
+        $schoolYear = $this->resolveSchoolYear($schoolYear);
+        $semester = $this->resolveSemester($semester);
+
+        return $this->buildStickerCounts($schoolYear, $semester, null, $this->specialMapWithKg());
+    }
+
+    public function listForClass(?string $schoolYear, ?string $semester, int $classSectionId): array
+    {
+        $schoolYear = $this->resolveSchoolYear($schoolYear);
+        $semester = $this->resolveSemester($semester);
+
+        return $this->buildStickerCounts($schoolYear, $semester, $classSectionId, $this->specialMapWithoutKg());
+    }
+
+    private function resolveSchoolYear(?string $schoolYear): string
+    {
+        return $schoolYear && trim($schoolYear) !== ''
+            ? $schoolYear
+            : (string) Configuration::getConfig('school_year');
+    }
+
+    private function resolveSemester(?string $semester): string
+    {
+        return $semester && trim($semester) !== ''
+            ? $semester
+            : (string) Configuration::getConfig('semester');
+    }
+
+    private function buildStickerCounts(string $schoolYear, string $semester, ?int $classSectionId, array $specialMap): array
+    {
+        $builder = DB::table('student_class as sc')
+            ->select(
+                'sc.student_id',
+                's.firstname',
+                's.lastname',
+                's.is_new',
+                'cs.class_section_name AS grade_label'
+            )
+            ->join('students as s', 's.id', '=', 'sc.student_id')
+            ->join('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->join('classes as c', 'c.id', '=', 'cs.class_id')
+            ->where('sc.school_year', $schoolYear);
+
+        if ($classSectionId !== null && $classSectionId > 0) {
+            $builder->where('sc.class_section_id', $classSectionId);
+        }
+
+        $rows = $builder->get()->toArray();
+
+        $students = [];
+        $totalPrimary = 0;
+        $totalSecondary = 0;
+
+        foreach ($rows as $row) {
+            $grade = trim((string) ($row->grade_label ?? ''));
+            if ($grade === '' || $this->isYouth($grade)) {
+                continue;
+            }
+
+            $isNew = (int) ($row->is_new ?? 0) === 1;
+            [$primary, $secondary] = $this->calculateStickerCounts($grade, $isNew, $specialMap);
+
+            $totalPrimary += $primary;
+            $totalSecondary += $secondary;
+
+            $students[] = [
+                'student_id' => (int) ($row->student_id ?? 0),
+                'firstname' => trim((string) ($row->firstname ?? '')),
+                'lastname' => trim((string) ($row->lastname ?? '')),
+                'grade_label' => $grade,
+                'primary_count' => $primary,
+                'secondary_count' => $secondary,
+            ];
+        }
+
+        return [
+            'schoolYear' => $schoolYear,
+            'semester' => $semester,
+            'classSectionId' => $classSectionId,
+            'students' => $students,
+            'totals' => [
+                'primary' => $totalPrimary,
+                'secondary' => $totalSecondary,
+                'students' => count($students),
+            ],
+        ];
+    }
+
+    private function calculateStickerCounts(string $grade, bool $isNew, array $specialMap): array
+    {
+        $primary = 0;
+        $secondary = 0;
+
+        if (array_key_exists($grade, $specialMap)) {
+            $primary = (int) $specialMap[$grade];
+            $secondary = 0;
+        } elseif ($this->isUpperBlock($grade)) {
+            if ($isNew) {
+                $primary = 4;
+                $secondary = 0;
+            } else {
+                $primary = $this->isGrade5($grade) ? 3 : 2;
+                $secondary = max(0, 4 - $primary);
+            }
+        } else {
+            $primary = 4;
+            $secondary = 0;
+        }
+
+        return [$primary, $secondary];
+    }
+
+    private function isUpperBlock(string $grade): bool
+    {
+        return (bool) preg_match('/^(3|4|5|6|7|8)(-[AB])?$/', trim($grade));
+    }
+
+    private function isGrade5(string $grade): bool
+    {
+        return (bool) preg_match('/^5(\-|$)/', trim($grade));
+    }
+
+    private function isYouth(string $grade): bool
+    {
+        return (bool) preg_match('/^youth(?:\b|-)/i', trim($grade));
+    }
+
+    private function specialMapWithKg(): array
+    {
+        return [
+            'KG' => 1,
+            '1-A' => 3,
+            '1-B' => 4,
+            '2-A' => 5,
+            '2-B' => 5,
+            '9' => 2,
+        ];
+    }
+
+    private function specialMapWithoutKg(): array
+    {
+        return [
+            '1-A' => 3,
+            '1-B' => 4,
+            '2-A' => 5,
+            '2-B' => 5,
+            '9' => 2,
+        ];
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationAdjustmentService.php b/app/Services/ClassPreparation/ClassPreparationAdjustmentService.php
new file mode 100644
index 00000000..e2b2296e
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationAdjustmentService.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use App\Models\ClassPrepAdjustment;
+
+class ClassPreparationAdjustmentService
+{
+    public function applyAdjustments(array $baseItems, string $classSectionId, string $schoolYear): array
+    {
+        $rawAdjustments = ClassPrepAdjustment::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->where('adjustable', 1)
+            ->get()
+            ->toArray();
+
+        $adjMap = ['Large Table' => 0, 'Small Table' => 0];
+        foreach ($rawAdjustments as $adjustment) {
+            $item = $adjustment['item_name'] ?? '';
+            $delta = (int) ($adjustment['adjustment'] ?? 0);
+            if (array_key_exists($item, $adjMap)) {
+                $adjMap[$item] = $delta;
+            }
+            if (isset($baseItems[$item])) {
+                $baseItems[$item] = max(0, (int) $baseItems[$item] + $delta);
+            }
+        }
+
+        return [$baseItems, $adjMap];
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationCalculatorService.php b/app/Services/ClassPreparation/ClassPreparationCalculatorService.php
new file mode 100644
index 00000000..069cdbfc
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationCalculatorService.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use App\Models\ClassSection;
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+
+class ClassPreparationCalculatorService
+{
+    private array $allowedPrepCategories = [
+        'Grade Box',
+        'Large Table',
+        'Regular Chair',
+        'Small Chair',
+        'Small Table',
+        'Teacher Chair',
+        'Trash Bin',
+        'White Board',
+    ];
+
+    public function getAllowedCategories(): array
+    {
+        return $this->allowedPrepCategories;
+    }
+
+    public function getClassLevelBySection(string $classSectionId): int
+    {
+        $sectionName = ClassSection::getClassSectionNameBySectionId($classSectionId);
+        $label = $sectionName !== null && $sectionName !== '' ? (string) $sectionName : $classSectionId;
+
+        if (preg_match('/^(kg|k)(\\b|[^a-z0-9])/i', $label)) {
+            return 1;
+        }
+
+        $numValue = (int) preg_replace('/\\D/', '', $label);
+
+        if ($numValue > 0 && $numValue < 30) {
+            $firstDigit = (int) substr((string) $numValue, 0, 1);
+            return $firstDigit === 1 ? 1 : ($firstDigit === 2 ? 2 : 3);
+        }
+
+        return 3;
+    }
+
+    public function calculatePrepItems(int $students, int $classLevel, string $classSectionId): array
+    {
+        $allowed = $this->allowedPrepCategories;
+        $items = array_fill_keys($allowed, 0);
+
+        $categories = DB::table('inventory_categories')
+            ->select('name', 'grade_min', 'grade_max')
+            ->where('type', 'classroom')
+            ->whereIn('name', $allowed)
+            ->orderBy('name')
+            ->get()
+            ->toArray();
+
+        $isLowerGrades = in_array($classLevel, [1, 2], true);
+        $teacherCount = $this->getTeacherCountForSection(
+            $classSectionId,
+            (string) Configuration::getConfig('school_year')
+        );
+
+        foreach ($categories as $cat) {
+            $name = (string) $cat->name;
+            $gradeMin = $cat->grade_min ?? null;
+            $gradeMax = $cat->grade_max ?? null;
+
+            if ($gradeMin !== null && $classLevel < (int) $gradeMin) {
+                $items[$name] = 0;
+                continue;
+            }
+            if ($gradeMax !== null && $classLevel > (int) $gradeMax) {
+                $items[$name] = 0;
+                continue;
+            }
+
+            $qty = 0;
+            switch (strtolower($name)) {
+                case 'small table':
+                    $qty = $isLowerGrades ? (int) ceil($students / 3) : 0;
+                    break;
+                case 'large table':
+                    $qty = $isLowerGrades ? 0 : (int) ceil($students / 4);
+                    break;
+                case 'small chair':
+                    $qty = $isLowerGrades ? $students : 0;
+                    break;
+                case 'regular chair':
+                    $qty = $isLowerGrades ? 0 : $students;
+                    break;
+                case 'teacher chair':
+                    $qty = (int) $teacherCount;
+                    break;
+                case 'trash bin':
+                case 'white board':
+                case 'grade box':
+                    $qty = 1;
+                    break;
+                default:
+                    $qty = 0;
+            }
+
+            if (array_key_exists($name, $items)) {
+                $items[$name] = $qty;
+            }
+        }
+
+        return $items;
+    }
+
+    private function getTeacherCountForSection(string $classSectionId, ?string $schoolYear = null): int
+    {
+        $schoolYear = $schoolYear ?: (string) Configuration::getConfig('school_year');
+
+        $row = DB::table('teacher_class')
+            ->select('COUNT(*) AS cnt')
+            ->where('class_section_id', $classSectionId)
+            ->whereIn('position', ['main', 'ta'])
+            ->where('school_year', $schoolYear)
+            ->first();
+
+        return (int) ($row->cnt ?? 0);
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationContextService.php b/app/Services/ClassPreparation/ClassPreparationContextService.php
new file mode 100644
index 00000000..a3d80999
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationContextService.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+
+class ClassPreparationContextService
+{
+    /** cache for roster presence per term */
+    private array $rosterPresenceCache = [];
+
+    public function getSchoolYear(): string
+    {
+        return (string) (Configuration::getConfig('school_year') ?? '');
+    }
+
+    public function getSemester(): string
+    {
+        return (string) (Configuration::getConfig('semester') ?? '');
+    }
+
+    public function hasRosterForSemester(string $schoolYear, string $semester): bool
+    {
+        $year = trim((string) $schoolYear);
+        $sem = trim((string) $semester);
+        if ($year === '' || $sem === '') {
+            return false;
+        }
+
+        $key = sprintf('sem:%s:%s', $year, $sem);
+        if (array_key_exists($key, $this->rosterPresenceCache)) {
+            return $this->rosterPresenceCache[$key];
+        }
+
+        $cnt = DB::table('student_class')
+            ->where('school_year', $year)
+            ->where('semester', $sem)
+            ->count();
+
+        $this->rosterPresenceCache[$key] = $cnt > 0;
+        return $this->rosterPresenceCache[$key];
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationInventoryService.php b/app/Services/ClassPreparation/ClassPreparationInventoryService.php
new file mode 100644
index 00000000..f3d0f4fd
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationInventoryService.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use Illuminate\Support\Facades\DB;
+
+class ClassPreparationInventoryService
+{
+    public function buildAvailability(string $schoolYear, string $semester, bool $limitToSemester, array $allowed): array
+    {
+        $inventoryMap = array_fill_keys($allowed, 0);
+
+        $joinRows = DB::table('inventory_items as ii')
+            ->select('ic.name AS item_name, COALESCE(SUM(CASE WHEN ii.good_qty IS NOT NULL THEN ii.good_qty WHEN ii.`condition`=\"good\" THEN ii.quantity ELSE 0 END),0) AS available')
+            ->join('inventory_categories as ic', 'ic.id', '=', 'ii.category_id')
+            ->where('ii.type', 'classroom')
+            ->where('ii.school_year', $schoolYear)
+            ->whereIn('ic.name', $allowed);
+
+        if ($limitToSemester && $semester !== '') {
+            $joinRows->where('ii.semester', $semester);
+        }
+
+        $joinRows = $joinRows->groupBy('ic.name')->get()->toArray();
+
+        foreach ($joinRows as $r) {
+            $name = (string) ($r->item_name ?? '');
+            if ($name !== '' && isset($inventoryMap[$name])) {
+                $inventoryMap[$name] = max($inventoryMap[$name], (int) ($r->available ?? 0));
+            }
+        }
+
+        $nameRows = DB::table('inventory_items')
+            ->select('name AS item_name, COALESCE(SUM(CASE WHEN good_qty IS NOT NULL THEN good_qty WHEN `condition`=\"good\" THEN quantity ELSE 0 END),0) AS available')
+            ->where('type', 'classroom')
+            ->where('school_year', $schoolYear)
+            ->whereIn('name', $allowed);
+
+        if ($limitToSemester && $semester !== '') {
+            $nameRows->where('semester', $semester);
+        }
+
+        $nameRows = $nameRows->groupBy('name')->get()->toArray();
+
+        foreach ($nameRows as $r) {
+            $name = (string) ($r->item_name ?? '');
+            if ($name !== '' && isset($inventoryMap[$name])) {
+                $inventoryMap[$name] = max($inventoryMap[$name], (int) ($r->available ?? 0));
+            }
+        }
+
+        return $inventoryMap;
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationLogService.php b/app/Services/ClassPreparation/ClassPreparationLogService.php
new file mode 100644
index 00000000..23d51b96
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationLogService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use App\Models\ClassPreparationLog;
+
+class ClassPreparationLogService
+{
+    public function getLatestLog(string $classSectionId, string $schoolYear): ?ClassPreparationLog
+    {
+        return ClassPreparationLog::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->orderBy('created_at', 'DESC')
+            ->first();
+    }
+
+    public function hasPrepChanged(array $new, array $old): bool
+    {
+        ksort($new);
+        ksort($old);
+
+        return json_encode($new) !== json_encode($old);
+    }
+
+    public function createLog(string $classSectionId, string $className, string $schoolYear, array $items, string $createdAt): bool
+    {
+        try {
+            ClassPreparationLog::query()->create([
+                'class_section_id' => $classSectionId,
+                'class_section' => $className,
+                'school_year' => $schoolYear,
+                'prep_data' => json_encode($items),
+                'created_at' => $createdAt,
+            ]);
+            return true;
+        } catch (\Throwable $e) {
+            return false;
+        }
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationRosterService.php b/app/Services/ClassPreparation/ClassPreparationRosterService.php
new file mode 100644
index 00000000..2439c178
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationRosterService.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use Illuminate\Support\Facades\DB;
+
+class ClassPreparationRosterService
+{
+    public function getClassSectionStudentCounts(string $schoolYear, string $semester, bool $limitToSemester): array
+    {
+        $query = DB::table('student_class as sc')
+            ->select('sc.class_section_id, COUNT(DISTINCT sc.student_id) AS student_count', false)
+            ->join('students as s', 's.id', '=', 'sc.student_id')
+            ->where('s.is_active', 1)
+            ->where('sc.school_year', $schoolYear);
+
+        if ($limitToSemester && $semester !== '') {
+            $query->where('sc.semester', $semester);
+        }
+
+        return $query->groupBy('sc.class_section_id')->get()->toArray();
+    }
+
+    public function getStudentCountForSection(string $schoolYear, string $semester, bool $limitToSemester, string $classSectionId): int
+    {
+        $query = DB::table('student_class as sc')
+            ->select('COUNT(DISTINCT sc.student_id) AS cnt', false)
+            ->join('students as s', 's.id', '=', 'sc.student_id')
+            ->where('s.is_active', 1)
+            ->where('sc.class_section_id', $classSectionId)
+            ->where('sc.school_year', $schoolYear);
+
+        if ($limitToSemester && $semester !== '') {
+            $query->where('sc.semester', $semester);
+        }
+
+        $row = $query->first();
+        return (int) ($row->cnt ?? 0);
+    }
+}
diff --git a/app/Services/ClassPreparation/ClassPreparationService.php b/app/Services/ClassPreparation/ClassPreparationService.php
new file mode 100644
index 00000000..dc20a7f4
--- /dev/null
+++ b/app/Services/ClassPreparation/ClassPreparationService.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Services\ClassPreparation;
+
+use App\Models\ClassSection;
+
+class ClassPreparationService
+{
+    private ClassPreparationContextService $context;
+    private ClassPreparationRosterService $roster;
+    private ClassPreparationInventoryService $inventory;
+    private ClassPreparationCalculatorService $calculator;
+    private ClassPreparationAdjustmentService $adjustments;
+    private ClassPreparationLogService $logs;
+
+    public function __construct(
+        ClassPreparationContextService $context,
+        ClassPreparationRosterService $roster,
+        ClassPreparationInventoryService $inventory,
+        ClassPreparationCalculatorService $calculator,
+        ClassPreparationAdjustmentService $adjustments,
+        ClassPreparationLogService $logs
+    ) {
+        $this->context = $context;
+        $this->roster = $roster;
+        $this->inventory = $inventory;
+        $this->calculator = $calculator;
+        $this->adjustments = $adjustments;
+        $this->logs = $logs;
+    }
+
+    public function listPrep(?string $schoolYear = null, ?string $semester = null): array
+    {
+        $schoolYear = $schoolYear ?: $this->context->getSchoolYear();
+        $semester = $semester ?: $this->context->getSemester();
+        $allowed = $this->calculator->getAllowedCategories();
+        $limitToSemester = $this->context->hasRosterForSemester($schoolYear, $semester);
+
+        $classSections = $this->roster->getClassSectionStudentCounts($schoolYear, $semester, $limitToSemester);
+
+        $inventoryMap = $this->inventory->buildAvailability($schoolYear, $semester, $limitToSemester, $allowed);
+        $requiredTotals = array_fill_keys($allowed, 0);
+        $results = [];
+
+        foreach ($classSections as $row) {
+            $classSectionId = (string) $row->class_section_id;
+            $studentCount = (int) $row->student_count;
+            $classLevel = $this->calculator->getClassLevelBySection($classSectionId);
+            $className = ClassSection::getClassSectionNameBySectionId($classSectionId);
+
+            $baseItems = $this->calculator->calculatePrepItems($studentCount, $classLevel, $classSectionId);
+            [$baseItems, $adjMap] = $this->adjustments->applyAdjustments($baseItems, $classSectionId, $schoolYear);
+
+            foreach ($allowed as $cat) {
+                $requiredTotals[$cat] += (int) ($baseItems[$cat] ?? 0);
+            }
+
+            $oldSnap = $this->logs->getLatestLog($classSectionId, $schoolYear);
+            $oldPrep = $oldSnap ? (array) ($oldSnap->prep_data ?? []) : [];
+            $hasChanged = $this->logs->hasPrepChanged($baseItems, $oldPrep);
+
+            $results[] = [
+                'class_section'    => $className,
+                'class_section_id' => $classSectionId,
+                'student_count'    => $studentCount,
+                'class_level'      => $classLevel,
+                'prep_items'       => $baseItems,
+                'needs_print'      => $hasChanged,
+                'last_printed_at'  => $oldSnap?->created_at,
+                'adjustments'      => $adjMap,
+            ];
+        }
+
+        $shortages = [];
+        foreach ($requiredTotals as $item => $reqQty) {
+            $have = (int) ($inventoryMap[$item] ?? 0);
+            if ($have < (int) $reqQty) {
+                $shortages[$item] = (int) $reqQty - $have;
+            }
+        }
+
+        return [
+            'schoolYear' => $schoolYear,
+            'semester' => $semester,
+            'results' => $results,
+            'totals' => $requiredTotals,
+            'shortages' => $shortages,
+        ];
+    }
+
+    public function markPrinted(string $schoolYear, string $semester, array $classSectionIds): int
+    {
+        $limitToSemester = $this->context->hasRosterForSemester($schoolYear, $semester);
+        $ids = array_values(array_unique(array_filter(array_map('strval', $classSectionIds))));
+        $now = $this->utcNow();
+        $count = 0;
+
+        foreach ($ids as $classSectionId) {
+            $studentCount = $this->roster->getStudentCountForSection($schoolYear, $semester, $limitToSemester, $classSectionId);
+            $classLevel = $this->calculator->getClassLevelBySection($classSectionId);
+            $className = ClassSection::getClassSectionNameBySectionId($classSectionId) ?? $classSectionId;
+
+            $items = $this->calculator->calculatePrepItems($studentCount, $classLevel, $classSectionId);
+            [$items] = $this->adjustments->applyAdjustments($items, $classSectionId, $schoolYear);
+
+            if ($this->logs->createLog($classSectionId, $className, $schoolYear, $items, $now)) {
+                $count++;
+            }
+        }
+
+        return $count;
+    }
+
+    private function utcNow(): string
+    {
+        if (function_exists('utc_now')) {
+            return (string) utc_now();
+        }
+        return now('UTC')->toDateTimeString();
+    }
+}
diff --git a/app/Services/Communication/CommunicationFamilyService.php b/app/Services/Communication/CommunicationFamilyService.php
new file mode 100644
index 00000000..af849bb0
--- /dev/null
+++ b/app/Services/Communication/CommunicationFamilyService.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Services\Communication;
+
+use App\Models\FamilyStudent;
+use Illuminate\Support\Facades\DB;
+
+class CommunicationFamilyService
+{
+    public function familiesForStudent(int $studentId): array
+    {
+        return FamilyStudent::getFamiliesForStudent($studentId);
+    }
+
+    public function guardiansForFamily(int $familyId): array
+    {
+        return DB::table('family_guardians as fg')
+            ->join('users as u', 'u.id', '=', 'fg.user_id')
+            ->where('fg.family_id', $familyId)
+            ->select(
+                'u.id as user_id',
+                'u.firstname',
+                'u.lastname',
+                'u.email',
+                'fg.relation',
+                'fg.is_primary',
+                'fg.receive_emails',
+                'fg.receive_sms'
+            )
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    public function guardianSalutation(int $familyId): string
+    {
+        $rows = DB::table('family_guardians as fg')
+            ->join('users as u', 'u.id', '=', 'fg.user_id')
+            ->where('fg.family_id', $familyId)
+            ->where('fg.receive_emails', 1)
+            ->orderByDesc('fg.is_primary')
+            ->orderBy('u.lastname')
+            ->orderBy('u.firstname')
+            ->select('u.firstname', 'u.lastname')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        if (empty($rows)) {
+            return 'Parent/Guardian';
+        }
+
+        $names = array_map(static function ($row) {
+            return trim(($row['firstname'] ?? '') . ' ' . ($row['lastname'] ?? ''));
+        }, $rows);
+
+        return implode(' & ', $names);
+    }
+}
diff --git a/app/Services/Communication/CommunicationLogService.php b/app/Services/Communication/CommunicationLogService.php
new file mode 100644
index 00000000..f6bca614
--- /dev/null
+++ b/app/Services/Communication/CommunicationLogService.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services\Communication;
+
+use App\Models\CommunicationLog;
+use Illuminate\Support\Facades\Schema;
+
+class CommunicationLogService
+{
+    public function log(array $payload): void
+    {
+        if (!Schema::hasTable('communication_logs')) {
+            return;
+        }
+
+        CommunicationLog::query()->create($payload);
+    }
+}
diff --git a/app/Services/Communication/CommunicationPreviewService.php b/app/Services/Communication/CommunicationPreviewService.php
new file mode 100644
index 00000000..0539b745
--- /dev/null
+++ b/app/Services/Communication/CommunicationPreviewService.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Services\Communication;
+
+class CommunicationPreviewService
+{
+    private CommunicationTemplateService $templates;
+    private CommunicationStudentService $students;
+    private CommunicationFamilyService $families;
+
+    public function __construct(
+        CommunicationTemplateService $templates,
+        CommunicationStudentService $students,
+        CommunicationFamilyService $families
+    ) {
+        $this->templates = $templates;
+        $this->students = $students;
+        $this->families = $families;
+    }
+
+    public function buildPreview(
+        string $templateKey,
+        int $studentId,
+        int $familyId,
+        array $vars,
+        string $teacherName
+    ): array {
+        $template = $this->templates->findTemplateByKey($templateKey);
+        if (!$template) {
+            return [
+                'ok' => false,
+                'status' => 404,
+                'message' => 'Template not found',
+            ];
+        }
+
+        $student = $this->students->getStudentBasic($studentId);
+        if (!$student) {
+            return [
+                'ok' => false,
+                'status' => 404,
+                'message' => 'Student not found',
+            ];
+        }
+
+        $salutation = $this->families->guardianSalutation($familyId);
+
+        $autoVars = [
+            'student_fullname' => trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? '')),
+            'student_grade' => $student['grade'] ?? '',
+            'parent_salutation' => $salutation,
+            'date' => $this->formatLocalDate('Y-m-d'),
+            'school_name' => 'Al Rahma Sunday School',
+            'teacher_name' => $teacherName !== '' ? $teacherName : 'Teacher',
+        ];
+
+        $allVars = array_merge($autoVars, $vars);
+
+        $subject = $this->renderTwig($template['subject'], $allVars);
+        $body = $this->renderTwig($template['body'], $allVars);
+
+        return [
+            'ok' => true,
+            'subject' => $subject,
+            'html' => nl2br($body),
+        ];
+    }
+
+    private function renderTwig(string $template, array $vars): string
+    {
+        return (string) preg_replace_callback('/\\{\\{\\s*([a-zA-Z0-9_\\.]+)\\s*\\}\\}/', function ($m) use ($vars) {
+            $key = $m[1];
+            return htmlspecialchars((string) ($vars[$key] ?? ''), ENT_QUOTES, 'UTF-8');
+        }, $template);
+    }
+
+    private function formatLocalDate(string $format): string
+    {
+        if (function_exists('local_date') && function_exists('utc_now')) {
+            return (string) local_date(utc_now(), $format);
+        }
+        return now()->format($format);
+    }
+}
diff --git a/app/Services/Communication/CommunicationSendService.php b/app/Services/Communication/CommunicationSendService.php
new file mode 100644
index 00000000..c045a9a8
--- /dev/null
+++ b/app/Services/Communication/CommunicationSendService.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Services\Communication;
+
+use App\Services\EmailService;
+
+class CommunicationSendService
+{
+    private EmailService $mailer;
+    private CommunicationLogService $logService;
+
+    public function __construct(EmailService $mailer, CommunicationLogService $logService)
+    {
+        $this->mailer = $mailer;
+        $this->logService = $logService;
+    }
+
+    public function send(array $payload): array
+    {
+        $recipients = $this->normalizeEmails($payload['recipients'] ?? []);
+        $cc = $this->normalizeEmails($payload['cc'] ?? []);
+        $bcc = $this->normalizeEmails($payload['bcc'] ?? []);
+
+        if (empty($recipients)) {
+            $this->logService->log([
+                'student_id' => (int) $payload['student_id'],
+                'family_id' => (int) $payload['family_id'],
+                'student_name' => (string) $payload['student_name'],
+                'template_key' => (string) $payload['template_key'],
+                'subject' => (string) $payload['subject'],
+                'body' => (string) $payload['body'],
+                'recipients' => [],
+                'cc' => array_values($cc),
+                'bcc' => array_values($bcc),
+                'status' => 'failed',
+                'error_message' => 'No recipients provided',
+                'sent_by' => (int) ($payload['sent_by'] ?? 0),
+                'metadata' => null,
+            ]);
+
+            return [
+                'ok' => false,
+                'error' => 'No recipients provided',
+            ];
+        }
+
+        $sendOk = false;
+        $error = null;
+
+        try {
+            $sendOk = $this->mailer->send(
+                $recipients,
+                (string) $payload['subject'],
+                (string) $payload['body'],
+                'general',
+                $cc,
+                $bcc
+            );
+        } catch (\Throwable $t) {
+            $error = $t->getMessage();
+            $sendOk = false;
+        }
+
+        if (!$sendOk && $error === null) {
+            $error = 'Mailer returned false';
+        }
+
+        $this->logService->log([
+            'student_id' => (int) $payload['student_id'],
+            'family_id' => (int) $payload['family_id'],
+            'student_name' => (string) $payload['student_name'],
+            'template_key' => (string) $payload['template_key'],
+            'subject' => (string) $payload['subject'],
+            'body' => (string) $payload['body'],
+            'recipients' => array_values($recipients),
+            'cc' => array_values($cc),
+            'bcc' => array_values($bcc),
+            'status' => $sendOk ? 'sent' : 'failed',
+            'error_message' => $error,
+            'sent_by' => (int) ($payload['sent_by'] ?? 0),
+            'metadata' => null,
+        ]);
+
+        return [
+            'ok' => $sendOk,
+            'error' => $error,
+        ];
+    }
+
+    private function normalizeEmails(array $values): array
+    {
+        $out = array_values(array_unique(array_filter(array_map('strval', $values))));
+        return array_values(array_filter($out, static function ($email) {
+            return $email !== '';
+        }));
+    }
+}
diff --git a/app/Services/Communication/CommunicationStudentService.php b/app/Services/Communication/CommunicationStudentService.php
new file mode 100644
index 00000000..00c59790
--- /dev/null
+++ b/app/Services/Communication/CommunicationStudentService.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Services\Communication;
+
+use Illuminate\Support\Facades\DB;
+
+class CommunicationStudentService
+{
+    public function listStudents(): array
+    {
+        return DB::table('students')
+            ->select('id', 'firstname', 'lastname', 'registration_grade')
+            ->orderBy('lastname', 'asc')
+            ->orderBy('firstname', 'asc')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    public function getStudentBasic(int $studentId): ?array
+    {
+        $row = DB::table('students as s')
+            ->leftJoin('student_class as sc', 'sc.student_id', '=', 's.id')
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->select(
+                's.id',
+                's.firstname',
+                's.lastname',
+                's.registration_grade',
+                'cs.class_section_name as class_section_name'
+            )
+            ->where('s.id', $studentId)
+            ->orderBy('sc.id', 'desc')
+            ->first();
+
+        if (!$row) {
+            return null;
+        }
+
+        $row = (array) $row;
+        $grade = $row['registration_grade'] ?? '';
+        if (!$grade && !empty($row['class_section_name'])) {
+            $grade = $row['class_section_name'];
+        }
+
+        return [
+            'id' => (int) $row['id'],
+            'firstname' => (string) ($row['firstname'] ?? ''),
+            'lastname' => (string) ($row['lastname'] ?? ''),
+            'grade' => (string) ($grade ?? ''),
+        ];
+    }
+}
diff --git a/app/Services/Communication/CommunicationTemplateService.php b/app/Services/Communication/CommunicationTemplateService.php
new file mode 100644
index 00000000..372c8da6
--- /dev/null
+++ b/app/Services/Communication/CommunicationTemplateService.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Services\Communication;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class CommunicationTemplateService
+{
+    public function listActiveTemplates(): array
+    {
+        [$keyColumn, $bodyColumn] = $this->resolveTemplateColumns();
+
+        return DB::table('email_templates')
+            ->where('is_active', 1)
+            ->orderBy($keyColumn, 'asc')
+            ->get()
+            ->map(function ($row) use ($keyColumn, $bodyColumn) {
+                $row = (array) $row;
+                return [
+                    'template_key' => (string) ($row[$keyColumn] ?? ''),
+                    'subject' => (string) ($row['subject'] ?? ''),
+                    'body' => (string) ($row[$bodyColumn] ?? ''),
+                ];
+            })
+            ->all();
+    }
+
+    public function findTemplateByKey(string $key): ?array
+    {
+        [$keyColumn, $bodyColumn] = $this->resolveTemplateColumns();
+
+        $row = DB::table('email_templates')
+            ->where($keyColumn, $key)
+            ->where('is_active', 1)
+            ->first();
+
+        if (!$row) {
+            return null;
+        }
+
+        $row = (array) $row;
+
+        return [
+            'template_key' => (string) ($row[$keyColumn] ?? ''),
+            'subject' => (string) ($row['subject'] ?? ''),
+            'body' => (string) ($row[$bodyColumn] ?? ''),
+        ];
+    }
+
+    private function resolveTemplateColumns(): array
+    {
+        $keyColumn = Schema::hasColumn('email_templates', 'template_key') ? 'template_key' : 'code';
+        $bodyColumn = Schema::hasColumn('email_templates', 'body') ? 'body' : 'body_html';
+        return [$keyColumn, $bodyColumn];
+    }
+}
diff --git a/app/Services/CompetitionScores/CompetitionScoresContextService.php b/app/Services/CompetitionScores/CompetitionScoresContextService.php
new file mode 100644
index 00000000..f89f75d6
--- /dev/null
+++ b/app/Services/CompetitionScores/CompetitionScoresContextService.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Services\CompetitionScores;
+
+use App\Models\ClassSection;
+use App\Models\Configuration;
+use App\Models\TeacherClass;
+
+class CompetitionScoresContextService
+{
+    public function getTeacherContext(int $userId): array
+    {
+        $schoolYear = (string) (Configuration::getConfig('school_year') ?? '');
+        $semester = (string) (Configuration::getConfig('semester') ?? '');
+        $assignments = TeacherClass::getClassAssignmentsByUserId($userId, $schoolYear, $semester);
+
+        return [$assignments, $schoolYear, $semester];
+    }
+
+    public function getAllowedClassIds(array $assignments): array
+    {
+        $ids = array_map(static function ($row) {
+            return (int) ($row['class_section_id'] ?? 0);
+        }, $assignments);
+
+        return array_values(array_filter(array_unique($ids)));
+    }
+
+    public function resolveActiveClassId(array $assignments, int $requestedClassId = 0): int
+    {
+        $allowed = $this->getAllowedClassIds($assignments);
+        if ($requestedClassId > 0 && in_array($requestedClassId, $allowed, true)) {
+            return $requestedClassId;
+        }
+
+        return (int) ($allowed[0] ?? 0);
+    }
+
+    public function getActiveClassName(array $assignments, int $classSectionId): ?string
+    {
+        if ($classSectionId <= 0) {
+            return null;
+        }
+
+        foreach ($assignments as $row) {
+            if ((int) ($row['class_section_id'] ?? 0) === $classSectionId) {
+                return $row['class_section_name'] ?? null;
+            }
+        }
+
+        return ClassSection::getClassSectionNameBySectionId($classSectionId);
+    }
+
+    public function getClassSectionMap(): array
+    {
+        $sections = ClassSection::query()
+            ->select('class_section_id', 'class_section_name')
+            ->orderBy('class_section_name', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $map = [];
+        foreach ($sections as $section) {
+            $id = (int) ($section['class_section_id'] ?? 0);
+            if ($id > 0) {
+                $map[$id] = $section['class_section_name'] ?? (string) $id;
+            }
+        }
+
+        return $map;
+    }
+}
diff --git a/app/Services/CompetitionScores/CompetitionScoresQueryService.php b/app/Services/CompetitionScores/CompetitionScoresQueryService.php
new file mode 100644
index 00000000..e59d0adf
--- /dev/null
+++ b/app/Services/CompetitionScores/CompetitionScoresQueryService.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Services\CompetitionScores;
+
+use App\Models\Competition;
+use App\Models\CompetitionClassWinner;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class CompetitionScoresQueryService
+{
+    public function getCompetitionsForClass(int $classSectionId, string $schoolYear, string $semester): array
+    {
+        $builder = Competition::query()->orderBy('id', 'DESC');
+
+        if ($classSectionId > 0) {
+            $builder->where(function ($q) use ($classSectionId) {
+                $q->where('class_section_id', $classSectionId)
+                    ->orWhere('class_section_id', 0)
+                    ->orWhereNull('class_section_id');
+            });
+        }
+
+        if ($schoolYear !== '') {
+            $builder->where(function ($q) use ($schoolYear) {
+                $q->where('school_year', $schoolYear)
+                    ->orWhere('school_year', '')
+                    ->orWhereNull('school_year');
+            });
+        }
+
+        if ($semester !== '') {
+            $builder->where(function ($q) use ($semester) {
+                $q->where('semester', $semester)
+                    ->orWhere('semester', '')
+                    ->orWhereNull('semester');
+            });
+        }
+
+        return $builder->get()->map(fn ($row) => (array) $row)->all();
+    }
+
+    public function getQuestionCounts(array $competitionIds, int $classSectionId): array
+    {
+        if (!$this->hasQuestionCount() || empty($competitionIds)) {
+            return [];
+        }
+
+        $rows = CompetitionClassWinner::query()
+            ->select('competition_id', 'question_count')
+            ->where('class_section_id', $classSectionId)
+            ->whereIn('competition_id', $competitionIds)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $out = [];
+        foreach ($rows as $row) {
+            $compId = (int) ($row['competition_id'] ?? 0);
+            if ($compId > 0 && $row['question_count'] !== null) {
+                $out[$compId] = (int) $row['question_count'];
+            }
+        }
+
+        return $out;
+    }
+
+    public function getScoreCounts(array $competitionIds, int $classSectionId): array
+    {
+        if (empty($competitionIds)) {
+            return [];
+        }
+
+        $rows = DB::table('competition_scores')
+            ->selectRaw('competition_id, COUNT(*) AS total')
+            ->where('class_section_id', $classSectionId)
+            ->whereIn('competition_id', $competitionIds)
+            ->groupBy('competition_id')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $out = [];
+        foreach ($rows as $row) {
+            $compId = (int) ($row['competition_id'] ?? 0);
+            if ($compId > 0) {
+                $out[$compId] = (int) ($row['total'] ?? 0);
+            }
+        }
+
+        return $out;
+    }
+
+    public function getQuestionCountForCompetition(int $competitionId, int $classSectionId): ?int
+    {
+        if (!$this->hasQuestionCount()) {
+            return null;
+        }
+
+        $row = CompetitionClassWinner::query()
+            ->select('question_count')
+            ->where('competition_id', $competitionId)
+            ->where('class_section_id', $classSectionId)
+            ->first();
+
+        if ($row && $row->question_count !== null) {
+            return (int) $row->question_count;
+        }
+
+        return null;
+    }
+
+    private function hasQuestionCount(): bool
+    {
+        return Schema::hasTable('competition_class_winners')
+            && Schema::hasColumn('competition_class_winners', 'question_count');
+    }
+}
diff --git a/app/Services/CompetitionScores/CompetitionScoresRosterService.php b/app/Services/CompetitionScores/CompetitionScoresRosterService.php
new file mode 100644
index 00000000..06727500
--- /dev/null
+++ b/app/Services/CompetitionScores/CompetitionScoresRosterService.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Services\CompetitionScores;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class CompetitionScoresRosterService
+{
+    private string $classStudentTable;
+
+    public function __construct()
+    {
+        if (Schema::hasTable('class_student')) {
+            $this->classStudentTable = 'class_student';
+        } elseif (Schema::hasTable('student_class')) {
+            $this->classStudentTable = 'student_class';
+        } else {
+            $this->classStudentTable = '';
+        }
+    }
+
+    public function getClassStudentCount(int $classSectionId, ?string $schoolYear): int
+    {
+        if ($classSectionId <= 0 || $this->classStudentTable === '') {
+            return 0;
+        }
+
+        $builder = DB::table($this->classStudentTable)
+            ->selectRaw('COUNT(*) AS total')
+            ->where('class_section_id', $classSectionId);
+
+        if ($schoolYear && Schema::hasColumn($this->classStudentTable, 'school_year')) {
+            $builder->where('school_year', $schoolYear);
+        }
+
+        $row = (array) $builder->first();
+        return (int) ($row['total'] ?? 0);
+    }
+
+    public function getStudentsForCompetition(array $competition, int $classSectionId): array
+    {
+        if ($classSectionId <= 0 || $this->classStudentTable === '') {
+            return [];
+        }
+
+        $builder = DB::table('students as s')
+            ->select('s.id', 's.school_id', 's.firstname', 's.lastname')
+            ->join($this->classStudentTable . ' as cs', 'cs.student_id', '=', 's.id')
+            ->where('cs.class_section_id', $classSectionId);
+
+        if (Schema::hasColumn($this->classStudentTable, 'school_year')) {
+            $schoolYear = (string) ($competition['school_year'] ?? '');
+            if ($schoolYear !== '') {
+                $builder->where('cs.school_year', $schoolYear);
+            }
+        }
+
+        return $builder
+            ->distinct()
+            ->orderBy('s.lastname', 'ASC')
+            ->orderBy('s.firstname', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+}
diff --git a/app/Services/CompetitionScores/CompetitionScoresSaveService.php b/app/Services/CompetitionScores/CompetitionScoresSaveService.php
new file mode 100644
index 00000000..ce9305fb
--- /dev/null
+++ b/app/Services/CompetitionScores/CompetitionScoresSaveService.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Services\CompetitionScores;
+
+use App\Models\CompetitionScore;
+
+class CompetitionScoresSaveService
+{
+    public function filterScores(array $scores): array
+    {
+        $cleanScores = [];
+        $invalidScores = [];
+
+        foreach ($scores as $studentId => $scoreValue) {
+            $scoreValue = trim((string) $scoreValue);
+            if ($scoreValue === '') {
+                continue;
+            }
+            if (!preg_match('/^\\d+$/', $scoreValue)) {
+                $invalidScores[] = (int) $studentId;
+                continue;
+            }
+            $cleanScores[(int) $studentId] = (int) $scoreValue;
+        }
+
+        return [$cleanScores, $invalidScores];
+    }
+
+    public function saveScores(int $competitionId, int $classSectionId, array $scores): void
+    {
+        foreach ($scores as $studentId => $scoreValue) {
+            CompetitionScore::query()->updateOrCreate(
+                [
+                    'competition_id' => $competitionId,
+                    'student_id' => (int) $studentId,
+                    'class_section_id' => $classSectionId,
+                ],
+                [
+                    'score' => (int) $scoreValue,
+                    'class_section_id' => $classSectionId,
+                ]
+            );
+        }
+    }
+
+    public function getScoreMap(int $competitionId, int $classSectionId): array
+    {
+        $rows = CompetitionScore::query()
+            ->select('student_id', 'score')
+            ->where('competition_id', $competitionId)
+            ->where('class_section_id', $classSectionId)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $map = [];
+        foreach ($rows as $row) {
+            $map[(int) $row['student_id']] = $row['score'];
+        }
+
+        return $map;
+    }
+}
diff --git a/app/Services/Discounts/DiscountApplyService.php b/app/Services/Discounts/DiscountApplyService.php
new file mode 100644
index 00000000..01c10c39
--- /dev/null
+++ b/app/Services/Discounts/DiscountApplyService.php
@@ -0,0 +1,294 @@
+<?php
+
+namespace App\Services\Discounts;
+
+use App\Models\DiscountVoucher;
+use App\Models\Invoice;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class DiscountApplyService
+{
+    private DiscountContextService $context;
+    private DiscountInvoiceService $invoiceService;
+
+    public function __construct(DiscountContextService $context, DiscountInvoiceService $invoiceService)
+    {
+        $this->context = $context;
+        $this->invoiceService = $invoiceService;
+    }
+
+    public function applyVoucher(int $voucherId, array $parentIds, bool $allowAdditional, int $actorId): array
+    {
+        $schoolYear = $this->context->getSchoolYear();
+        $semester = $this->context->getSemester();
+
+        $voucher = DiscountVoucher::query()->find($voucherId);
+        if (!$voucher) {
+            return ['ok' => false, 'message' => 'Voucher not found.'];
+        }
+
+        $voucherDescription = trim((string) ($voucher->description ?? ''));
+        $voucherDescription = preg_replace(
+            '/^Auto-generated on \\d{4}-\\d{2}-\\d{2}\\s*[—-]\\s*reason:\\s*/i',
+            '',
+            $voucherDescription
+        );
+
+        $maxUsesRaw = $voucher->max_uses;
+        $maxUses = ($maxUsesRaw === null || $maxUsesRaw === '') ? null : (int) $maxUsesRaw;
+        $timesUsed = (int) ($voucher->times_used ?? 0);
+        $remainingUses = ($maxUses === null) ? PHP_INT_MAX : ($maxUses - $timesUsed);
+        if ($remainingUses <= 0) {
+            return ['ok' => false, 'message' => 'This voucher has reached its maximum allowed uses.'];
+        }
+
+        if (!$allowAdditional) {
+            $rows = DB::table('discount_usages as du')
+                ->select('i.parent_id')
+                ->join('invoices as i', 'i.id', '=', 'du.invoice_id')
+                ->whereIn('i.parent_id', $parentIds)
+                ->where('i.school_year', $schoolYear)
+                ->groupBy('i.parent_id')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            $blockedParentIds = array_map(static fn ($r) => (int) ($r['parent_id'] ?? 0), $rows);
+            if (!empty($blockedParentIds)) {
+                $parentIds = array_values(array_diff(array_map('intval', $parentIds), $blockedParentIds));
+            }
+            if (empty($parentIds)) {
+                return [
+                    'ok' => false,
+                    'message' => 'All selected parents already have discounts. Enable "Allow additional discounts" to apply another.',
+                ];
+            }
+        }
+
+        $paymentDate = function_exists('utc_now') ? utc_now() : now('UTC')->toDateTimeString();
+        $fullyCoveredInvoiceIds = [];
+        $touchedInvoiceIds = [];
+        $appliedCount = 0;
+
+        DB::beginTransaction();
+
+        try {
+            foreach ($parentIds as $parentId) {
+                $invoices = Invoice::getInvoicesByUserId((int) $parentId, $schoolYear);
+                if (empty($invoices)) {
+                    Log::warning('Discount apply: parent has no invoices', [
+                        'parent_id' => (int) $parentId,
+                        'voucher_id' => $voucherId,
+                    ]);
+                    continue;
+                }
+
+                foreach ($invoices as $invoice) {
+                    if ($remainingUses <= 0) {
+                        break 2;
+                    }
+
+                    $invoiceId = (int) ($invoice['id'] ?? 0);
+                    if ($invoiceId <= 0) {
+                        continue;
+                    }
+
+                    $initialPreBalance = (float) $this->invoiceService->getCurrentInvoiceBalance($invoiceId, $schoolYear);
+                    if ($initialPreBalance <= 0) {
+                        continue;
+                    }
+
+                    if (!$allowAdditional) {
+                        $exists = DB::table('discount_usages as du')
+                            ->join('invoices as i', 'du.invoice_id', '=', 'i.id')
+                            ->where('du.voucher_id', $voucherId)
+                            ->where('du.invoice_id', $invoiceId)
+                            ->where('i.school_year', $schoolYear)
+                            ->count();
+                        if ($exists) {
+                            continue;
+                        }
+                    }
+
+                    $rawDiscount = $voucher->discount_type === 'percent'
+                        ? round(((float) ($invoice['total_amount'] ?? 0) * (float) $voucher->discount_value) / 100, 2)
+                        : (float) $voucher->discount_value;
+
+                    $discount = min($rawDiscount, $initialPreBalance);
+                    if ($discount <= 0) {
+                        continue;
+                    }
+
+                    $now = function_exists('utc_now') ? utc_now() : now('UTC')->toDateTimeString();
+                    DB::table('discount_usages')->insert([
+                        'voucher_id' => $voucherId,
+                        'invoice_id' => $invoiceId,
+                        'parent_id' => (int) $parentId,
+                        'discount_amount' => $discount,
+                        'description' => $voucherDescription,
+                        'school_year' => $schoolYear,
+                        'updated_by' => $actorId,
+                        'used_at' => $now,
+                        'created_at' => $now,
+                        'updated_at' => $now,
+                        'semester' => $semester,
+                    ]);
+
+                    $newBalance = max(0.0, round($initialPreBalance - $discount, 2));
+                    DB::table('invoices')
+                        ->where('id', $invoiceId)
+                        ->update([
+                            'balance' => $newBalance,
+                            'has_discount' => 1,
+                            'updated_at' => $now,
+                        ]);
+
+                    $postBalance = round($initialPreBalance - $discount, 2);
+                    if ($postBalance < 0) {
+                        $postBalance = 0.0;
+                    }
+
+                    $currentBalance = (float) $this->invoiceService->getCurrentInvoiceBalance($invoiceId, $schoolYear);
+
+                    DB::table('discount_vouchers')
+                        ->where('id', $voucherId)
+                        ->update([
+                            'times_used' => DB::raw('COALESCE(times_used,0) + 1'),
+                        ]);
+
+                    $this->triggerPaymentReceived(
+                        $invoiceId,
+                        (string) $voucherId,
+                        $discount,
+                        $paymentDate,
+                        $initialPreBalance,
+                        $postBalance,
+                        $schoolYear,
+                        $semester
+                    );
+
+                    $touchedInvoiceIds[] = $invoiceId;
+                    $appliedCount++;
+
+                    $epsilon = 0.01;
+                    $fullyCovered = (abs($discount - $initialPreBalance) <= $epsilon)
+                        || ($postBalance <= $epsilon)
+                        || ($currentBalance <= $epsilon);
+
+                    if ($fullyCovered) {
+                        $fullyCoveredInvoiceIds[] = $invoiceId;
+                    }
+
+                    $remainingUses--;
+
+                    if ($remainingUses <= 0 && $maxUses !== null) {
+                        DB::table('discount_vouchers')
+                            ->where('id', $voucherId)
+                            ->update([
+                                'is_active' => 0,
+                                'updated_at' => $now,
+                            ]);
+                        break 2;
+                    }
+                }
+            }
+
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            return ['ok' => false, 'message' => 'Voucher application failed. Transaction rolled back.'];
+        }
+
+        if ($appliedCount === 0) {
+            return [
+                'ok' => false,
+                'message' => 'No discounts were applied. The voucher may already be used for these invoices or balances are zero.',
+            ];
+        }
+
+        if ($maxUses !== null) {
+            $row = (array) DB::table('discount_vouchers')
+                ->select('times_used')
+                ->where('id', $voucherId)
+                ->first();
+            $usedNow = (int) ($row['times_used'] ?? 0);
+            if ($usedNow >= $maxUses) {
+                DB::table('discount_vouchers')
+                    ->where('id', $voucherId)
+                    ->update([
+                        'is_active' => 0,
+                        'updated_at' => function_exists('utc_now') ? utc_now() : now('UTC')->toDateTimeString(),
+                    ]);
+            }
+        }
+
+        foreach (array_unique($touchedInvoiceIds) as $iid) {
+            try {
+                $this->invoiceService->recalculateInvoice($iid, $schoolYear);
+            } catch (\Throwable $e) {
+                Log::error('recalculateInvoice failed for invoice {id}: {err}', [
+                    'id' => $iid,
+                    'err' => $e->getMessage(),
+                ]);
+            }
+        }
+
+        $updatedTotal = 0;
+        foreach (array_unique($fullyCoveredInvoiceIds) as $iid) {
+            try {
+                $updatedTotal += $this->invoiceService->updateEnrollmentStatusIfPaid($iid, $schoolYear);
+            } catch (\Throwable $e) {
+                Log::error('updateEnrollmentStatusIfPaid failed for invoice {id}: {err}', [
+                    'id' => $iid,
+                    'err' => $e->getMessage(),
+                ]);
+            }
+        }
+
+        return [
+            'ok' => true,
+            'message' => $updatedTotal > 0
+                ? 'Voucher applied successfully and enrollments updated.'
+                : 'Voucher applied successfully.',
+            'appliedCount' => $appliedCount,
+            'updatedEnrollments' => $updatedTotal,
+            'touchedInvoices' => array_values(array_unique($touchedInvoiceIds)),
+        ];
+    }
+
+    private function triggerPaymentReceived(
+        int $invoiceId,
+        string $voucherId,
+        float $amount,
+        string $paymentDate,
+        float $preBalance,
+        float $postBalance,
+        string $schoolYear,
+        string $semester
+    ): void {
+        try {
+            [$eventData, $studentData] = $this->invoiceService->buildPaymentEventData(
+                $invoiceId,
+                $voucherId,
+                $amount,
+                'discount',
+                $paymentDate,
+                '',
+                0,
+                $preBalance,
+                $postBalance,
+                $schoolYear,
+                $semester
+            );
+
+            if (class_exists(\CodeIgniter\Events\Events::class)) {
+                \CodeIgniter\Events\Events::trigger('paymentReceived', $eventData, $studentData);
+            } elseif (function_exists('event')) {
+                event('paymentReceived', [$eventData, $studentData]);
+            }
+        } catch (\Throwable $e) {
+            Log::warning('paymentReceived hook failed: ' . $e->getMessage());
+        }
+    }
+}
diff --git a/app/Services/Discounts/DiscountContextService.php b/app/Services/Discounts/DiscountContextService.php
new file mode 100644
index 00000000..b6327690
--- /dev/null
+++ b/app/Services/Discounts/DiscountContextService.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services\Discounts;
+
+use App\Models\Configuration;
+
+class DiscountContextService
+{
+    public function getSchoolYear(): string
+    {
+        return (string) (Configuration::getConfig('school_year') ?? '');
+    }
+
+    public function getSemester(): string
+    {
+        return (string) (Configuration::getConfig('semester') ?? '');
+    }
+}
diff --git a/app/Services/Discounts/DiscountInvoiceService.php b/app/Services/Discounts/DiscountInvoiceService.php
new file mode 100644
index 00000000..4928794e
--- /dev/null
+++ b/app/Services/Discounts/DiscountInvoiceService.php
@@ -0,0 +1,394 @@
+<?php
+
+namespace App\Services\Discounts;
+
+use App\Models\AdditionalCharge;
+use App\Models\ClassSection;
+use App\Models\Configuration;
+use App\Models\Enrollment;
+use App\Models\EventCharges;
+use App\Models\Invoice;
+use App\Models\Payment;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class DiscountInvoiceService
+{
+    public function getCurrentInvoiceBalance(int $invoiceId, string $schoolYear): float
+    {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            return 0.0;
+        }
+
+        $paymentQuery = Payment::query()
+            ->selectRaw('COALESCE(SUM(paid_amount),0) AS total_paid')
+            ->where('invoice_id', $invoiceId)
+            ->where('school_year', $schoolYear);
+
+        if (Schema::hasColumn('payments', 'status')) {
+            $paymentQuery->where(function ($q) {
+                $q->whereNotIn('status', [
+                    'void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled',
+                ])->orWhereNull('status');
+            });
+        }
+
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $paymentQuery->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        $rowPaid = (array) $paymentQuery->first();
+        $totalPaid = (float) ($rowPaid['total_paid'] ?? 0);
+
+        $rowDisc = (array) DB::table('discount_usages as du')
+            ->join('invoices as i', 'i.id', '=', 'du.invoice_id')
+            ->where('du.invoice_id', $invoiceId)
+            ->where('i.school_year', $schoolYear)
+            ->selectRaw('COALESCE(SUM(du.discount_amount),0) AS total_disc')
+            ->first();
+        $totalDisc = (float) ($rowDisc['total_disc'] ?? 0);
+
+        $rowRefund = (array) DB::table('refunds')
+            ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
+            ->where('invoice_id', $invoiceId)
+            ->where('school_year', $schoolYear)
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->first();
+        $totalRefundPaid = (float) ($rowRefund['total_refund_paid'] ?? 0);
+
+        $total = (float) ($invoice->total_amount ?? 0);
+        return max(0.0, round($total - $totalPaid - $totalDisc - $totalRefundPaid, 2));
+    }
+
+    public function recalculateInvoice(int $invoiceId, string $schoolYear): void
+    {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            return;
+        }
+
+        $parentId = (int) ($invoice->parent_id ?? 0);
+        if ($parentId <= 0) {
+            return;
+        }
+
+        $enrollments = Enrollment::query()
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $registered = [];
+        $withdrawn = [];
+        foreach ($enrollments as $e) {
+            $row = [
+                'student_id' => (int) ($e['student_id'] ?? 0),
+                'class_section_id' => $e['class_section_id'] ?? null,
+                'enrollment_status' => (string) ($e['enrollment_status'] ?? ''),
+            ];
+            if (in_array($row['enrollment_status'], ['enrolled', 'payment pending'], true)) {
+                $registered[] = $row;
+            } elseif (in_array($row['enrollment_status'], ['withdrawn', 'refund pending', 'withdraw under review'], true)) {
+                $withdrawn[] = $row;
+            }
+        }
+
+        $refundDeadline = (string) (Configuration::getConfig('refund_deadline') ?? '');
+        $refundAllowed = true;
+        if ($refundDeadline !== '') {
+            try {
+                $tzName = function_exists('user_timezone') ? (string) user_timezone() : 'UTC';
+                $tz = new \DateTimeZone($tzName);
+                $today = new \DateTimeImmutable('today', $tz);
+                $deadline = new \DateTimeImmutable($refundDeadline, $tz);
+                $refundAllowed = $today <= $deadline;
+            } catch (\Throwable $e) {
+                $refundAllowed = true;
+            }
+        }
+
+        $tuitionStudents = $registered;
+        if (!$refundAllowed) {
+            $tuitionStudents = array_merge($tuitionStudents, $withdrawn);
+        }
+
+        $gradeFee = (int) (Configuration::getConfig('grade_fee') ?? 9);
+        $firstStudentFee = (float) (Configuration::getConfig('first_student_fee') ?? 350);
+        $secondStudentFee = (float) (Configuration::getConfig('second_student_fee') ?? 200);
+        $youthFee = (float) (Configuration::getConfig('youth_fee') ?? 180);
+
+        foreach ($tuitionStudents as &$s) {
+            $name = null;
+            if (!empty($s['class_section_id'])) {
+                $name = ClassSection::getClassSectionNameBySectionId($s['class_section_id']);
+            }
+            $s['grade_name'] = is_string($name) ? strtoupper(trim($name)) : 'N/A';
+        }
+        unset($s);
+
+        $regularCount = 0;
+        $youthCount = 0;
+        foreach ($tuitionStudents as $s) {
+            $lvl = $this->parseGradeLevel((string) ($s['grade_name'] ?? ''), $gradeFee);
+            if ($lvl > $gradeFee) {
+                $youthCount++;
+            } else {
+                $regularCount++;
+            }
+        }
+
+        $tuitionSubtotal = 0.0;
+        $tuitionSubtotal += $youthCount * $youthFee;
+        if ($regularCount >= 2) {
+            $tuitionSubtotal += $firstStudentFee + ($regularCount - 1) * $secondStudentFee;
+        } elseif ($regularCount === 1) {
+            $tuitionSubtotal += $firstStudentFee;
+        }
+
+        $eventSubtotal = 0.0;
+        $events = EventCharges::getChargesWithEventInfo($parentId, $schoolYear) ?? [];
+        foreach ($events as $ev) {
+            $eventSubtotal += (float) ($ev['charged'] ?? 0.0);
+        }
+
+        $additionalSubtotal = 0.0;
+        $rows = AdditionalCharge::query()
+            ->select('charge_type', 'amount')
+            ->where('invoice_id', $invoiceId)
+            ->where('status', 'applied')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        foreach ($rows as $r) {
+            $amt = (float) ($r['amount'] ?? 0);
+            $typ = strtolower((string) ($r['charge_type'] ?? 'add'));
+            $amt = $typ === 'deduct' ? -abs($amt) : abs($amt);
+            $additionalSubtotal += $amt;
+        }
+
+        $newTotal = round($tuitionSubtotal + $eventSubtotal + $additionalSubtotal, 2);
+
+        $paymentQuery = Payment::query()
+            ->where('invoice_id', $invoiceId)
+            ->where('school_year', $schoolYear);
+
+        if (Schema::hasColumn('payments', 'status')) {
+            $paymentQuery->where(function ($q) {
+                $q->whereNotIn('status', [
+                    'void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled',
+                ])->orWhereNull('status');
+            });
+        }
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $paymentQuery->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        $payments = $paymentQuery->get()->map(fn ($row) => (array) $row)->all();
+        $totalPaid = 0.0;
+        foreach ($payments as $p) {
+            $totalPaid += (float) ($p['paid_amount'] ?? 0);
+        }
+
+        $discRow = (array) DB::table('discount_usages')
+            ->selectRaw('COALESCE(SUM(discount_amount),0) AS total_disc')
+            ->where('invoice_id', $invoiceId)
+            ->first();
+        $totalDisc = (float) ($discRow['total_disc'] ?? 0);
+
+        $refundRow = (array) DB::table('refunds')
+            ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
+            ->where('invoice_id', $invoiceId)
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->first();
+        $totalRefundPaid = (float) ($refundRow['total_refund_paid'] ?? 0);
+
+        $newBalance = max(0.0, $newTotal - $totalDisc - $totalPaid - $totalRefundPaid);
+        $newStatus = $newBalance <= 0.00001 ? 'Paid' : ($totalPaid > 0 ? 'Partially Paid' : 'Unpaid');
+
+        $updateData = [
+            'total_amount' => $newTotal,
+            'paid_amount' => $totalPaid,
+            'balance' => $newBalance,
+            'status' => $newStatus,
+            'has_discount' => $totalDisc > 0.0 ? 1 : 0,
+        ];
+
+        if (Schema::hasColumn('invoices', 'discount')) {
+            $updateData['discount'] = $totalDisc;
+        }
+
+        Invoice::query()->whereKey($invoiceId)->update($updateData);
+    }
+
+    public function updateEnrollmentStatusIfPaid(int $invoiceId, string $schoolYear): int
+    {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            return 0;
+        }
+
+        $total = (float) ($invoice->total_amount ?? 0);
+        $balance = (float) ($invoice->balance ?? 0);
+        if (!($total > 0 && $balance < $total)) {
+            return 0;
+        }
+
+        $parentId = (int) ($invoice->parent_id ?? 0);
+        if ($parentId <= 0 || $schoolYear === '') {
+            return 0;
+        }
+
+        $paidEnrollmentIds = [];
+        if (Schema::hasTable('invoice_items') && Schema::hasColumn('invoice_items', 'enrollment_id')) {
+            $rows = DB::table('invoice_items')
+                ->select('enrollment_id')
+                ->where('invoice_id', $invoiceId)
+                ->whereNotNull('enrollment_id')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($rows as $r) {
+                $eid = (int) ($r['enrollment_id'] ?? 0);
+                if ($eid > 0) {
+                    $paidEnrollmentIds[] = $eid;
+                }
+            }
+        }
+
+        $query = Enrollment::query()
+            ->select('id')
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->where(function ($q) {
+                $q->where('enrollment_status', 'payment pending')
+                    ->orWhere('enrollment_status', 'Payment pending')
+                    ->orWhere('enrollment_status', 'Payment Pending')
+                    ->orWhere('enrollment_status', 'PAYMENT PENDING')
+                    ->orWhereRaw("LOWER(TRIM(REPLACE(enrollment_status, CHAR(160), ' '))) = 'payment pending'");
+            });
+
+        if (!empty($paidEnrollmentIds)) {
+            $query->whereIn('id', array_values(array_unique($paidEnrollmentIds)));
+        }
+
+        $toUpdateIds = $query->get()->pluck('id')->map(fn ($id) => (int) $id)->all();
+        if (empty($toUpdateIds)) {
+            return 0;
+        }
+
+        $affected = Enrollment::query()
+            ->whereIn('id', $toUpdateIds)
+            ->update([
+                'enrollment_status' => 'enrolled',
+                'enrollment_date' => $this->formatLocalDate('Y-m-d'),
+            ]);
+
+        return (int) $affected;
+    }
+
+    public function buildPaymentEventData(
+        int $invoiceId,
+        string $transactionIdOrRef,
+        float $amount,
+        string $paymentMethod,
+        string $paymentDate,
+        ?string $checkNumber,
+        int $installmentSeq,
+        float $preBalance,
+        float $postBalance,
+        string $schoolYear,
+        string $semester
+    ): array {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            throw new \RuntimeException("Invoice {$invoiceId} not found");
+        }
+
+        $parentRow = (array) DB::table('users')
+            ->select('id', 'firstname', 'lastname', 'email')
+            ->where('id', $invoice->parent_id)
+            ->first();
+
+        if (empty($parentRow)) {
+            throw new \RuntimeException("Parent not found for invoice {$invoiceId}");
+        }
+
+        $studentRows = DB::table('students as s')
+            ->select('s.id', 's.firstname', 's.lastname', 'sc.class_section_id')
+            ->leftJoin('student_class as sc', 'sc.student_id', '=', 's.id')
+            ->where('s.parent_id', $invoice->parent_id)
+            ->where('sc.school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $data = [
+            'user_id' => (int) $parentRow['id'],
+            'email' => $parentRow['email'],
+            'firstname' => $parentRow['firstname'],
+            'lastname' => $parentRow['lastname'],
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+            'invoice_id' => $invoiceId,
+            'transaction_id' => $transactionIdOrRef,
+            'payment_date' => $paymentDate,
+            'amount' => $amount,
+            'method' => $paymentMethod,
+            'check_number' => $checkNumber,
+            'installment_seq' => $installmentSeq,
+            'invoice_total' => (float) $invoice->total_amount,
+            'pre_balance' => $preBalance,
+            'post_balance' => $postBalance,
+            'portalLink' => url('parent/invoices/' . $invoiceId),
+        ];
+
+        return [$data, $studentRows];
+    }
+
+    private function parseGradeLevel(string $grade, int $gradeFee): int
+    {
+        if (is_numeric($grade)) {
+            return (int) $grade;
+        }
+        $g = strtoupper(trim($grade));
+        $g = preg_replace('/\\s+/', ' ', $g);
+        $g = str_replace(['.', '_', '-'], ['', '', ' '], $g);
+
+        $kg = ['K', 'KG', 'K G', 'KINDER', 'KINDERGARTEN'];
+        if (in_array($g, $kg, true)) {
+            return 1;
+        }
+
+        $pk = ['PK', 'P K', 'PREK', 'PRE K', 'PRE KINDER', 'PREKINDER'];
+        if (in_array($g, $pk, true)) {
+            return -1;
+        }
+
+        if (preg_match('/^Y(?:OUTH)?\\s*(\\d+)?$/', $g, $m)) {
+            $n = isset($m[1]) && $m[1] !== '' ? max(1, (int) $m[1]) : 1;
+            return $gradeFee + $n;
+        }
+
+        if (preg_match('/^(?:GR?ADE\\s*)?(\\d{1,2})\\s*([A-Z]*)$/', $g, $m)) {
+            return (int) $m[1];
+        }
+
+        return 999;
+    }
+
+    private function formatLocalDate(string $format): string
+    {
+        if (function_exists('local_date') && function_exists('utc_now')) {
+            return (string) local_date(utc_now(), $format);
+        }
+        return now()->format($format);
+    }
+}
diff --git a/app/Services/Discounts/DiscountParentService.php b/app/Services/Discounts/DiscountParentService.php
new file mode 100644
index 00000000..959e8ab9
--- /dev/null
+++ b/app/Services/Discounts/DiscountParentService.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Services\Discounts;
+
+use App\Models\DiscountUsage;
+use App\Models\User;
+
+class DiscountParentService
+{
+    public function listParentsWithDiscounts(string $schoolYear): array
+    {
+        $parents = User::getParents();
+
+        foreach ($parents as &$parent) {
+            $total = DiscountUsage::getTotalDiscountByParentIdAndSchoolYear(
+                (int) ($parent['id'] ?? 0),
+                $schoolYear
+            );
+
+            $parent['total_discount'] = $total;
+            $parent['has_discount'] = $total > 0 ? 1 : 0;
+        }
+        unset($parent);
+
+        return $parents;
+    }
+}
diff --git a/app/Services/Discounts/DiscountVoucherService.php b/app/Services/Discounts/DiscountVoucherService.php
new file mode 100644
index 00000000..068919f3
--- /dev/null
+++ b/app/Services/Discounts/DiscountVoucherService.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services\Discounts;
+
+use App\Models\DiscountVoucher;
+
+class DiscountVoucherService
+{
+    public function listAll(): array
+    {
+        return DiscountVoucher::query()
+            ->orderByDesc('id')
+            ->get()
+            ->all();
+    }
+
+    public function listActive(): array
+    {
+        return DiscountVoucher::query()
+            ->where('is_active', 1)
+            ->orderByDesc('id')
+            ->get()
+            ->all();
+    }
+
+    public function create(array $payload): DiscountVoucher
+    {
+        return DiscountVoucher::query()->create($payload);
+    }
+
+    public function update(int $id, array $payload): DiscountVoucher
+    {
+        $voucher = DiscountVoucher::query()->findOrFail($id);
+        $voucher->fill($payload);
+        $voucher->save();
+        return $voucher;
+    }
+
+    public function find(int $id): DiscountVoucher
+    {
+        return DiscountVoucher::query()->findOrFail($id);
+    }
+
+    public function delete(int $id): void
+    {
+        DiscountVoucher::query()->whereKey($id)->delete();
+    }
+}
diff --git a/app/Services/EmailService.php b/app/Services/EmailService.php
new file mode 100644
index 00000000..6acf3238
--- /dev/null
+++ b/app/Services/EmailService.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
+
+class EmailService
+{
+    public function send(
+        array|string $to,
+        string $subject,
+        string $html,
+        string $fromKey = 'general',
+        array $cc = [],
+        array $bcc = []
+    ): bool
+    {
+        $sender = $this->resolveSender($fromKey);
+
+        try {
+            Mail::html($html, function ($message) use ($to, $subject, $sender, $cc, $bcc) {
+                $message->to($to)->subject($subject);
+                if ($sender['email'] !== '') {
+                    $message->from($sender['email'], $sender['name']);
+                }
+                if (!empty($cc)) {
+                    $message->cc($cc);
+                }
+                if (!empty($bcc)) {
+                    $message->bcc($bcc);
+                }
+            });
+            return true;
+        } catch (\Throwable $e) {
+            Log::error('EmailService send failed: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    private function resolveSender(string $fromKey): array
+    {
+        $fromKey = $fromKey !== '' ? $fromKey : 'general';
+        $json = env('MAIL_SENDERS', '{}');
+        $senders = json_decode($json, true);
+
+        if (is_array($senders) && isset($senders[$fromKey])) {
+            $info = $senders[$fromKey];
+            return [
+                'name' => (string) ($info['name'] ?? 'Sender'),
+                'email' => (string) ($info['email'] ?? ''),
+            ];
+        }
+
+        $fallbackAddress = (string) (config('mail.from.address') ?: (getenv('SMTP_USER') ?: ''));
+        $fallbackName = (string) (config('mail.from.name') ?: 'Al Rahma Sunday School');
+
+        return [
+            'name' => $fallbackName,
+            'email' => $fallbackAddress,
+        ];
+    }
+}
diff --git a/app/Services/Expenses/ExpenseContextService.php b/app/Services/Expenses/ExpenseContextService.php
new file mode 100644
index 00000000..0d3ea360
--- /dev/null
+++ b/app/Services/Expenses/ExpenseContextService.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services\Expenses;
+
+use App\Models\Configuration;
+
+class ExpenseContextService
+{
+    public function getSchoolYear(): string
+    {
+        return (string) (Configuration::getConfig('school_year') ?? '');
+    }
+
+    public function getSemester(): string
+    {
+        return (string) (Configuration::getConfig('semester') ?? '');
+    }
+}
diff --git a/app/Services/Expenses/ExpenseQueryService.php b/app/Services/Expenses/ExpenseQueryService.php
new file mode 100644
index 00000000..50804d96
--- /dev/null
+++ b/app/Services/Expenses/ExpenseQueryService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Expenses;
+
+use App\Models\Expense;
+use Illuminate\Support\Facades\DB;
+
+class ExpenseQueryService
+{
+    public function listAll(): array
+    {
+        return $this->baseQuery()
+            ->orderByDesc('expenses.created_at')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    public function findById(int $id): ?array
+    {
+        $row = $this->baseQuery()
+            ->where('expenses.id', $id)
+            ->first();
+
+        return $row ? (array) $row : null;
+    }
+
+    private function baseQuery()
+    {
+        return Expense::query()
+            ->selectRaw('
+                expenses.*,
+                u.firstname AS purchaser_firstname,
+                u.lastname AS purchaser_lastname,
+                approver.firstname AS approver_firstname,
+                approver.lastname AS approver_lastname
+            ')
+            ->leftJoin('users as u', 'u.id', '=', 'expenses.purchased_by')
+            ->leftJoin('users as approver', 'approver.id', '=', 'expenses.approved_by');
+    }
+}
diff --git a/app/Services/Expenses/ExpenseReceiptService.php b/app/Services/Expenses/ExpenseReceiptService.php
new file mode 100644
index 00000000..d7e5e044
--- /dev/null
+++ b/app/Services/Expenses/ExpenseReceiptService.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Services\Expenses;
+
+use Illuminate\Http\UploadedFile;
+
+class ExpenseReceiptService
+{
+    public function storeReceipt(UploadedFile $file): string
+    {
+        $stored = $file->store('receipts');
+        return basename($stored);
+    }
+
+    public function receiptUrl(?string $filename): ?string
+    {
+        if (!$filename) {
+            return null;
+        }
+        return url('receipts/' . $filename);
+    }
+}
diff --git a/app/Services/Expenses/ExpenseRetailorService.php b/app/Services/Expenses/ExpenseRetailorService.php
new file mode 100644
index 00000000..a113d3fa
--- /dev/null
+++ b/app/Services/Expenses/ExpenseRetailorService.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Services\Expenses;
+
+class ExpenseRetailorService
+{
+    public function listRetailors(): array
+    {
+        return [
+            'Amazon',
+            'Walmart',
+            'Costco',
+            "BJ's",
+            'Market Basket',
+            'Aldi',
+            'Hannaford',
+            "Sam's Club",
+            'HomeGoods',
+            'Hostinger',
+            'Wicked Cheesy',
+            'Shatila',
+            'Brothers Pizzeria',
+            'Paradise Biryani Pointe',
+            'Emad Leiman',
+            'Nova Trampoline Park',
+            "Lubin's Awards",
+            'Dollar Tree',
+            'Stop & Shop',
+            "Dunkin' Donuts",
+            "Giovanni's Pizza",
+            'Trader Joes',
+        ];
+    }
+}
diff --git a/app/Services/Expenses/ExpenseStaffService.php b/app/Services/Expenses/ExpenseStaffService.php
new file mode 100644
index 00000000..0a204b67
--- /dev/null
+++ b/app/Services/Expenses/ExpenseStaffService.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Services\Expenses;
+
+use Illuminate\Support\Facades\DB;
+
+class ExpenseStaffService
+{
+    public function listStaffUsers(): array
+    {
+        $rows = DB::table('users')
+            ->select('users.id', 'users.firstname', 'users.lastname', 'roles.name AS role_name')
+            ->leftJoin('user_roles', 'user_roles.user_id', '=', 'users.id')
+            ->leftJoin('roles', 'roles.id', '=', 'user_roles.role_id')
+            ->whereNotNull('roles.name')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $excludedRoles = array_map('strtolower', ['parent', 'student', 'guest']);
+        $staff = [];
+
+        foreach ($rows as $row) {
+            $roleName = strtolower((string) ($row['role_name'] ?? ''));
+            $id = (int) ($row['id'] ?? 0);
+            if ($id <= 0 || in_array($roleName, $excludedRoles, true)) {
+                continue;
+            }
+            if (!isset($staff[$id])) {
+                $staff[$id] = [
+                    'id' => $id,
+                    'firstname' => $row['firstname'] ?? '',
+                    'lastname' => $row['lastname'] ?? '',
+                ];
+            }
+        }
+
+        uasort($staff, static function ($a, $b) {
+            $nameA = trim(($a['firstname'] ?? '') . ' ' . ($a['lastname'] ?? ''));
+            $nameB = trim(($b['firstname'] ?? '') . ' ' . ($b['lastname'] ?? ''));
+            return strcasecmp($nameA, $nameB);
+        });
+
+        return array_values($staff);
+    }
+}
diff --git a/app/Services/Expenses/ExpenseStatusService.php b/app/Services/Expenses/ExpenseStatusService.php
new file mode 100644
index 00000000..143ca2c3
--- /dev/null
+++ b/app/Services/Expenses/ExpenseStatusService.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Services\Expenses;
+
+use App\Models\Expense;
+
+class ExpenseStatusService
+{
+    public function updateStatus(Expense $expense, string $status, string $reason, int $userId): Expense
+    {
+        $expense->status = $status;
+        $expense->status_reason = $reason;
+        $expense->approved_by = $userId;
+        $expense->updated_by = $userId;
+        $expense->save();
+
+        return $expense;
+    }
+}
diff --git a/app/Services/Expenses/ExpenseWriteService.php b/app/Services/Expenses/ExpenseWriteService.php
new file mode 100644
index 00000000..0bea865d
--- /dev/null
+++ b/app/Services/Expenses/ExpenseWriteService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Expenses;
+
+use App\Models\Expense;
+
+class ExpenseWriteService
+{
+    public function __construct(private ExpenseContextService $context) {}
+
+    public function store(array $payload): Expense
+    {
+        $schoolYear = $payload['school_year'] ?? $this->context->getSchoolYear();
+        $semester = $payload['semester'] ?? $this->context->getSemester();
+
+        $data = [
+            'category' => $payload['category'],
+            'amount' => $payload['amount'],
+            'receipt_path' => $payload['receipt_path'] ?? null,
+            'description' => $payload['description'] ?? null,
+            'retailor' => $payload['retailor'] ?? null,
+            'date_of_purchase' => $payload['date_of_purchase'],
+            'purchased_by' => $payload['purchased_by'],
+            'added_by' => $payload['added_by'],
+            'status' => $payload['status'],
+            'status_reason' => $payload['status_reason'] ?? null,
+            'approved_by' => $payload['approved_by'] ?? null,
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+        ];
+
+        return Expense::query()->create($data);
+    }
+
+    public function update(Expense $expense, array $payload): Expense
+    {
+        $expense->fill($payload);
+        $expense->save();
+        return $expense;
+    }
+}
diff --git a/app/Services/ExtraCharges/ExtraChargesChargeService.php b/app/Services/ExtraCharges/ExtraChargesChargeService.php
new file mode 100644
index 00000000..af80c2a0
--- /dev/null
+++ b/app/Services/ExtraCharges/ExtraChargesChargeService.php
@@ -0,0 +1,235 @@
+<?php
+
+namespace App\Services\ExtraCharges;
+
+use App\Models\AdditionalCharge;
+use App\Models\Invoice;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class ExtraChargesChargeService
+{
+    public function __construct(
+        private ExtraChargesContextService $context,
+        private ExtraChargesInvoiceService $invoiceService
+    ) {}
+
+    public function createCharge(array $payload): array
+    {
+        $invoiceId = $payload['invoice_id'] ?? null;
+        $chargeType = $payload['charge_type'];
+        $amountAbs = round(abs((float) $payload['amount']), 2);
+        $signedAmount = $chargeType === 'add' ? $amountAbs : -$amountAbs;
+        $schoolYear = $payload['school_year'] ?? $this->context->getSchoolYear();
+        $semester = $payload['semester'] ?? $this->context->getSemester();
+
+        $data = [
+            'parent_id' => (int) $payload['parent_id'],
+            'invoice_id' => $invoiceId,
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+            'charge_type' => $chargeType,
+            'title' => trim($payload['title']),
+            'description' => trim((string) ($payload['description'] ?? '')),
+            'amount' => $signedAmount,
+            'due_date' => $payload['due_date'] ?? null,
+            'status' => $invoiceId ? 'applied' : 'pending',
+            'created_by' => (int) ($payload['created_by'] ?? 0),
+            'created_at' => $payload['created_at'] ?? $this->utcNow(),
+        ];
+
+        $invoiceBefore = $invoiceId ? Invoice::getInvoicesByParentId((int) $payload['parent_id'], $schoolYear) : [];
+        $invoiceAfter = [];
+
+        DB::beginTransaction();
+
+        try {
+            $chargeId = AdditionalCharge::query()->create($data)->id;
+
+            if ($invoiceId) {
+                $this->invoiceService->applyToInvoice((int) $invoiceId, $chargeType, $amountAbs);
+            }
+
+            $invoiceAfter = $invoiceId ? Invoice::getInvoicesByParentId((int) $payload['parent_id'], $schoolYear) : [];
+
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            Log::error('Extra charge create failed: ' . $e->getMessage());
+            return ['ok' => false, 'message' => 'Failed to save charge.'];
+        }
+
+        $parentUser = User::getUserInfoById((int) $payload['parent_id']);
+        $this->triggerExtraChargeEvent($parentUser, $data, (int) $chargeId, $invoiceId, $invoiceBefore, $invoiceAfter);
+
+        return [
+            'ok' => true,
+            'id' => (int) $chargeId,
+            'invoice_id' => $invoiceId ? (int) $invoiceId : null,
+            'parent_id' => (int) $payload['parent_id'],
+        ];
+    }
+
+    public function updateCharge(AdditionalCharge $charge, array $payload): bool
+    {
+        $chargeType = $payload['charge_type'] ?? $charge->charge_type ?? 'add';
+        $amountRaw = isset($payload['amount']) ? (float) $payload['amount'] : (float) $charge->amount;
+        $newAmount = $chargeType === 'add' ? abs($amountRaw) : -abs($amountRaw);
+        $delta = $newAmount - (float) $charge->amount;
+
+        DB::beginTransaction();
+
+        try {
+            $charge->title = trim($payload['title'] ?? $charge->title);
+            $charge->description = trim($payload['description'] ?? $charge->description);
+            $charge->amount = $newAmount;
+            $charge->due_date = $payload['due_date'] ?? $charge->due_date;
+            $charge->charge_type = $chargeType;
+            if (array_key_exists('updated_by', $payload)) {
+                $charge->updated_by = $payload['updated_by'];
+            }
+            $charge->save();
+
+            if ($charge->status === 'applied' && !empty($charge->invoice_id) && abs($delta) > 0.00001) {
+                $this->invoiceService->adjustDelta((int) $charge->invoice_id, $delta);
+            }
+
+            DB::commit();
+            return true;
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            Log::error('Extra charge update failed: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    public function voidCharge(AdditionalCharge $charge): bool
+    {
+        DB::beginTransaction();
+
+        try {
+            $invoiceId = (int) ($charge->invoice_id ?? 0);
+            $amountAbs = round(abs((float) ($charge->amount ?? 0)), 2);
+            $chargeType = (string) ($charge->charge_type ?? 'add');
+            $status = (string) ($charge->status ?? 'pending');
+
+            if ($status === 'applied' && $invoiceId > 0 && $amountAbs > 0) {
+                $this->invoiceService->reverseOnInvoice($invoiceId, $chargeType, $amountAbs);
+            }
+
+            $charge->status = 'void';
+            $charge->save();
+
+            DB::commit();
+            return true;
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            Log::error('Extra charge void failed: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    public function reverseCharge(AdditionalCharge $charge): bool
+    {
+        $invoiceId = (int) ($charge->invoice_id ?? 0);
+        $amountAbs = round(abs((float) ($charge->amount ?? 0)), 2);
+        $chargeType = (string) ($charge->charge_type ?? 'add');
+        $status = (string) ($charge->status ?? 'pending');
+
+        if ($status !== 'applied' || $invoiceId <= 0 || $amountAbs <= 0) {
+            return false;
+        }
+
+        DB::beginTransaction();
+
+        try {
+            $this->invoiceService->reverseOnInvoice($invoiceId, $chargeType, $amountAbs);
+
+            $charge->status = 'pending';
+            $charge->invoice_id = null;
+            $charge->save();
+
+            DB::commit();
+            return true;
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            Log::error('Extra charge reverse failed: ' . $e->getMessage());
+            return false;
+        }
+    }
+
+    private function triggerExtraChargeEvent(?array $parentUser, array $payload, int $chargeId, ?int $invoiceId, array $invoiceBefore, array $invoiceAfter): void
+    {
+        if (!$parentUser) {
+            return;
+        }
+
+        $first = $parentUser['first_name'] ?? $parentUser['firstname'] ?? '';
+        $last = $parentUser['last_name'] ?? $parentUser['lastname'] ?? '';
+        $parentName = trim($first . ' ' . $last);
+
+        $before = $this->normalizeRow($invoiceBefore);
+        $after = $this->normalizeRow($invoiceAfter);
+
+        $invoiceTotal = $after ? (float) ($after['total_amount'] ?? 0) : 0.0;
+        $preBalance = $before ? (float) ($before['balance'] ?? 0) : 0.0;
+        $postBalance = $after ? (float) ($after['balance'] ?? 0) : 0.0;
+
+        $eventData = [
+            'user_id' => (int) ($parentUser['id'] ?? 0),
+            'email' => $parentUser['email'] ?? null,
+            'firstname' => $first,
+            'lastname' => $last,
+            'parentName' => $parentName,
+            'school_year' => $payload['school_year'],
+            'semester' => $payload['semester'],
+            'invoice_id' => $invoiceId,
+            'invoice_number' => $after['invoice_number'] ?? ($invoiceId ? 'INV-' . $invoiceId : null),
+            'charge_id' => $chargeId,
+            'charge_title' => $payload['title'],
+            'charge_desc' => $payload['description'],
+            'charge_type' => $payload['charge_type'],
+            'amount_signed' => $payload['amount'],
+            'amount_abs' => abs((float) $payload['amount']),
+            'due_date' => $payload['due_date'],
+            'created_at' => $payload['created_at'],
+            'pre_balance' => $preBalance,
+            'post_balance' => $postBalance,
+            'invoice_total' => $invoiceTotal,
+            'portal_link' => url('/login'),
+            'invoice_link' => $invoiceId ? url('parent/invoices/view/' . $invoiceId) : url('parent/invoices'),
+        ];
+
+        $students = [];
+
+        try {
+            if (class_exists(\CodeIgniter\Events\Events::class)) {
+                \CodeIgniter\Events\Events::trigger('extraCharge', $eventData, $students);
+            } elseif (function_exists('event')) {
+                event('extraCharge', [$eventData, $students]);
+            }
+        } catch (\Throwable $e) {
+            Log::warning('extraCharge event failed: ' . $e->getMessage());
+        }
+    }
+
+    private function normalizeRow($row): ?array
+    {
+        if (!$row) {
+            return null;
+        }
+        if (is_array($row) && isset($row[0]) && is_array($row[0])) {
+            return $row[0];
+        }
+        return is_array($row) ? $row : null;
+    }
+
+    private function utcNow(): string
+    {
+        if (function_exists('utc_now')) {
+            return (string) utc_now();
+        }
+        return now('UTC')->toDateTimeString();
+    }
+}
diff --git a/app/Services/ExtraCharges/ExtraChargesContextService.php b/app/Services/ExtraCharges/ExtraChargesContextService.php
new file mode 100644
index 00000000..00bc360a
--- /dev/null
+++ b/app/Services/ExtraCharges/ExtraChargesContextService.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services\ExtraCharges;
+
+use App\Models\Configuration;
+
+class ExtraChargesContextService
+{
+    public function getSchoolYear(): string
+    {
+        return (string) (Configuration::getConfig('school_year') ?? '');
+    }
+
+    public function getSemester(): string
+    {
+        return (string) (Configuration::getConfig('semester') ?? '');
+    }
+}
diff --git a/app/Services/ExtraCharges/ExtraChargesInvoiceService.php b/app/Services/ExtraCharges/ExtraChargesInvoiceService.php
new file mode 100644
index 00000000..ddb6b12b
--- /dev/null
+++ b/app/Services/ExtraCharges/ExtraChargesInvoiceService.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Services\ExtraCharges;
+
+use App\Models\Invoice;
+
+class ExtraChargesInvoiceService
+{
+    public function listInvoicesForParent(int $parentId, string $schoolYear): array
+    {
+        if ($parentId <= 0) {
+            return [];
+        }
+
+        $rows = Invoice::getInvoicesByParentId($parentId, $schoolYear) ?? [];
+
+        return array_map(function ($inv) {
+            $id = (int) ($inv['id'] ?? 0);
+            $num = (string) ($inv['invoice_number'] ?? ('INV-' . $id));
+            $status = strtolower((string) ($inv['status'] ?? ''));
+            $balance = (float) ($inv['balance'] ?? 0);
+            $issue = $inv['issue_date'] ?? null;
+
+            return [
+                'id' => $id,
+                'invoice_number' => $num,
+                'status' => $status,
+                'balance' => $balance,
+                'issue_date' => $issue,
+                'text' => $num
+                    . ($status ? ' — ' . ucfirst($status) : '')
+                    . ' (Bal: $' . number_format($balance, 2) . ')',
+            ];
+        }, $rows);
+    }
+
+    public function applyToInvoice(int $invoiceId, string $chargeType, float $amountAbs): void
+    {
+        if ($invoiceId <= 0 || $amountAbs <= 0) {
+            return;
+        }
+
+        if ($chargeType === 'add') {
+            Invoice::applyAdditionalCharge($invoiceId, $amountAbs);
+        } else {
+            Invoice::deductAdditionalCharge($invoiceId, $amountAbs);
+        }
+    }
+
+    public function reverseOnInvoice(int $invoiceId, string $chargeType, float $amountAbs): void
+    {
+        if ($invoiceId <= 0 || $amountAbs <= 0) {
+            return;
+        }
+
+        if ($chargeType === 'add') {
+            Invoice::reverseAdditionalCharge($invoiceId, $amountAbs);
+        } else {
+            Invoice::applyAdditionalCharge($invoiceId, $amountAbs);
+        }
+    }
+
+    public function adjustDelta(int $invoiceId, float $delta): void
+    {
+        if ($invoiceId <= 0 || abs($delta) <= 0.00001) {
+            return;
+        }
+
+        if ($delta > 0) {
+            Invoice::applyAdditionalCharge($invoiceId, $delta);
+        } else {
+            Invoice::reverseAdditionalCharge($invoiceId, abs($delta));
+        }
+    }
+}
diff --git a/app/Services/ExtraCharges/ExtraChargesListService.php b/app/Services/ExtraCharges/ExtraChargesListService.php
new file mode 100644
index 00000000..17c6bd15
--- /dev/null
+++ b/app/Services/ExtraCharges/ExtraChargesListService.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Services\ExtraCharges;
+
+use App\Models\AdditionalCharge;
+
+class ExtraChargesListService
+{
+    public function listForTerm(string $schoolYear, string $semester, ?string $status, ?string $q, int $perPage): array
+    {
+        $rows = AdditionalCharge::listAllForTerm($schoolYear, $semester, $status, $q, $perPage);
+        $meta = [
+            'perPage' => method_exists($rows, 'perPage') ? $rows->perPage() : $perPage,
+            'page' => method_exists($rows, 'currentPage') ? $rows->currentPage() : null,
+            'total' => method_exists($rows, 'total') ? $rows->total() : null,
+            'pageCount' => method_exists($rows, 'lastPage') ? $rows->lastPage() : null,
+        ];
+
+        $items = method_exists($rows, 'items') ? $rows->items() : (array) $rows;
+
+        return [$items, $meta];
+    }
+}
diff --git a/app/Services/ExtraCharges/ExtraChargesMetaService.php b/app/Services/ExtraCharges/ExtraChargesMetaService.php
new file mode 100644
index 00000000..ae429e6a
--- /dev/null
+++ b/app/Services/ExtraCharges/ExtraChargesMetaService.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Services\ExtraCharges;
+
+use Illuminate\Support\Facades\DB;
+
+class ExtraChargesMetaService
+{
+    public function getSchoolYears(string $fallbackYear = ''): array
+    {
+        $schoolYears = [];
+
+        try {
+            $rows = DB::table('additional_charges')
+                ->selectRaw('DISTINCT school_year')
+                ->whereNotNull('school_year')
+                ->orderByDesc('school_year')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($rows as $row) {
+                $val = (string) ($row['school_year'] ?? '');
+                if ($val !== '' && !in_array($val, $schoolYears, true)) {
+                    $schoolYears[] = $val;
+                }
+            }
+        } catch (\Throwable $e) {
+        }
+
+        try {
+            $rows = DB::table('invoices')
+                ->selectRaw('DISTINCT school_year')
+                ->whereNotNull('school_year')
+                ->orderByDesc('school_year')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($rows as $row) {
+                $val = (string) ($row['school_year'] ?? '');
+                if ($val !== '' && !in_array($val, $schoolYears, true)) {
+                    $schoolYears[] = $val;
+                }
+            }
+        } catch (\Throwable $e) {
+        }
+
+        if (empty($schoolYears) && $fallbackYear !== '') {
+            $schoolYears[] = $fallbackYear;
+            if (str_contains($fallbackYear, '-')) {
+                [$start] = explode('-', $fallbackYear) + [0 => ''];
+                $start = (int) $start;
+                if ($start > 0) {
+                    for ($i = 1; $i <= 3; $i++) {
+                        $schoolYears[] = ($start - $i) . '-' . (($start - $i) + 1);
+                    }
+                }
+            }
+        }
+
+        rsort($schoolYears);
+
+        return array_values(array_unique($schoolYears));
+    }
+}
diff --git a/app/Services/ExtraCharges/ExtraChargesParentService.php b/app/Services/ExtraCharges/ExtraChargesParentService.php
new file mode 100644
index 00000000..d9b3ad37
--- /dev/null
+++ b/app/Services/ExtraCharges/ExtraChargesParentService.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services\ExtraCharges;
+
+use Illuminate\Support\Facades\DB;
+
+class ExtraChargesParentService
+{
+    public function searchParents(string $q = '', int $limit = 20): array
+    {
+        $builder = DB::table('users')
+            ->select('users.id', 'users.firstname', 'users.lastname', 'users.email')
+            ->join('user_roles', 'user_roles.user_id', '=', 'users.id')
+            ->join('roles', 'roles.id', '=', 'user_roles.role_id')
+            ->where('roles.name', 'parent')
+            ->whereNull('user_roles.deleted_at');
+
+        if ($q !== '') {
+            $builder->where(function ($query) use ($q) {
+                $query->where('users.firstname', 'like', "%{$q}%")
+                    ->orWhere('users.lastname', 'like', "%{$q}%")
+                    ->orWhere('users.email', 'like', "%{$q}%");
+            });
+        }
+
+        $rows = $builder
+            ->orderBy('users.lastname', 'ASC')
+            ->orderBy('users.firstname', 'ASC')
+            ->limit($limit)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        return array_map(function ($row) {
+            $name = trim(($row['lastname'] ?? '') . ', ' . ($row['firstname'] ?? ''));
+            $email = $row['email'] ?? '';
+            $label = $name !== ',' ? $name : ('User #' . $row['id']);
+            if ($email) {
+                $label .= ' — ' . $email;
+            }
+            $label .= ' (ID: ' . $row['id'] . ')';
+            return [
+                'id' => (int) $row['id'],
+                'text' => $label,
+            ];
+        }, $rows);
+    }
+}
diff --git a/app/Services/Files/ExamDraftDownloadNameService.php b/app/Services/Files/ExamDraftDownloadNameService.php
new file mode 100644
index 00000000..e08fd3a8
--- /dev/null
+++ b/app/Services/Files/ExamDraftDownloadNameService.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Services\Files;
+
+use Illuminate\Support\Facades\DB;
+
+class ExamDraftDownloadNameService
+{
+    public function build(string $filename, string $subdir): string
+    {
+        $column = $subdir === 'finals' ? 'final_file' : 'teacher_file';
+
+        $row = DB::table('exam_drafts as ed')
+            ->select('ed.version', 'ed.exam_type', 'ed.class_section_id', 'cs.class_section_name')
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'ed.class_section_id')
+            ->where('ed.' . $column, $filename)
+            ->limit(1)
+            ->first();
+
+        $row = $row ? (array) $row : [];
+
+        $classLabel = trim((string) ($row['class_section_name'] ?? ('Class' . ($row['class_section_id'] ?? '0'))));
+        $typeLabel = trim((string) ($row['exam_type'] ?? 'Exam'));
+        $version = 'v' . max(1, (int) ($row['version'] ?? 1));
+
+        $parts = array_filter([
+            $this->slugify($classLabel),
+            $this->slugify($typeLabel),
+            $version,
+        ]);
+
+        return implode('_', $parts);
+    }
+
+    private function slugify(string $value): string
+    {
+        $value = trim($value);
+        $value = preg_replace('/[^\p{L}\p{N}]+/u', '_', $value);
+        $value = trim($value, '_');
+        if ($value === '') {
+            return 'Exam';
+        }
+        return mb_strtolower($value);
+    }
+}
diff --git a/app/Services/Files/FileServeService.php b/app/Services/Files/FileServeService.php
new file mode 100644
index 00000000..735c82f3
--- /dev/null
+++ b/app/Services/Files/FileServeService.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Services\Files;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class FileServeService
+{
+    public function meta(string $baseDir, string $name, array $allowedExtensions, ?string $downloadName = null): array
+    {
+        return $this->resolveFile($baseDir, $name, $allowedExtensions, $downloadName);
+    }
+
+    public function serveInline(
+        string $baseDir,
+        string $name,
+        array $allowedExtensions,
+        Request $request,
+        ?string $downloadName = null,
+        bool $nosniff = false
+    ): Response {
+        $meta = $this->resolveFile($baseDir, $name, $allowedExtensions, $downloadName);
+
+        $ifNoneMatch = trim((string) $request->headers->get('If-None-Match', ''), '"');
+        $ifModifiedSince = (string) $request->headers->get('If-Modified-Since', '');
+        $imsTime = $ifModifiedSince !== '' ? strtotime($ifModifiedSince) : false;
+
+        if (($ifNoneMatch !== '' && $ifNoneMatch === $meta['etag']) ||
+            ($imsTime !== false && $imsTime >= $meta['mtime'])
+        ) {
+            return response('', 304, $this->notModifiedHeaders($meta));
+        }
+
+        $headers = [
+            'Content-Type' => $meta['mime'],
+            'Content-Disposition' => 'inline; filename="' . $meta['download_name'] . '"',
+            'Content-Length' => (string) $meta['size'],
+            'ETag' => $meta['etag'],
+            'Last-Modified' => $meta['last_modified'],
+            'Cache-Control' => 'public, max-age=86400',
+        ];
+
+        if ($nosniff) {
+            $headers['X-Content-Type-Options'] = 'nosniff';
+        }
+
+        return response(file_get_contents($meta['path']), 200, $headers);
+    }
+
+    private function resolveFile(string $baseDir, string $name, array $allowedExtensions, ?string $downloadName): array
+    {
+        if ($name !== basename($name)) {
+            throw new HttpException(400, 'Invalid filename');
+        }
+
+        $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION));
+        if (!in_array($ext, $allowedExtensions, true)) {
+            throw new HttpException(404, 'File not found');
+        }
+
+        $path = rtrim($baseDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $name;
+        if (!is_file($path)) {
+            throw new HttpException(404, 'File not found');
+        }
+
+        $mime = $this->detectMime($path);
+        $mtime = filemtime($path) ?: time();
+        $size = filesize($path) ?: 0;
+        $etag = md5($name . '|' . $mtime . '|' . $size);
+        $downloadName = $downloadName ? $downloadName . '.' . $ext : $name;
+
+        return [
+            'name' => $name,
+            'path' => $path,
+            'mime' => $mime,
+            'mtime' => $mtime,
+            'size' => $size,
+            'etag' => $etag,
+            'download_name' => $downloadName,
+            'last_modified' => gmdate('D, d M Y H:i:s', $mtime) . ' GMT',
+        ];
+    }
+
+    private function detectMime(string $path): string
+    {
+        $mime = 'application/octet-stream';
+        if (function_exists('finfo_open')) {
+            $fi = finfo_open(FILEINFO_MIME_TYPE);
+            if ($fi) {
+                $detected = finfo_file($fi, $path);
+                if ($detected) {
+                    $mime = $detected;
+                }
+                finfo_close($fi);
+            }
+        } elseif (function_exists('mime_content_type')) {
+            $mime = mime_content_type($path) ?: $mime;
+        }
+
+        return $mime;
+    }
+
+    private function notModifiedHeaders(array $meta): array
+    {
+        return [
+            'ETag' => $meta['etag'],
+            'Last-Modified' => $meta['last_modified'],
+        ];
+    }
+}
diff --git a/app/Services/Finance/FinancialChartService.php b/app/Services/Finance/FinancialChartService.php
new file mode 100644
index 00000000..8beea7a1
--- /dev/null
+++ b/app/Services/Finance/FinancialChartService.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Services\Finance;
+
+class FinancialChartService
+{
+    public function generateBarChart(array $summary): ?string
+    {
+        if ($this->skipRemoteCharts()) {
+            return null;
+        }
+
+        $chartData = [
+            'type' => 'bar',
+            'data' => [
+                'labels' => ['Charges', 'Paid', 'Unpaid', 'Discounts', 'Refunds', 'Expenses', 'Reimbursements', 'Net'],
+                'datasets' => [[
+                    'label' => 'Amount (USD)',
+                    'data' => [
+                        $summary['totalCharges'] ?? 0,
+                        $summary['amountCollected'] ?? 0,
+                        $summary['totalUnpaid'] ?? 0,
+                        $summary['totalDiscounts'] ?? 0,
+                        $summary['totalRefunds'] ?? 0,
+                        $summary['totalExpenses'] ?? 0,
+                        $summary['totalReimbursements'] ?? 0,
+                        $summary['netAmount'] ?? 0,
+                    ],
+                    'backgroundColor' => 'rgba(54, 162, 235, 0.6)',
+                ]],
+            ],
+        ];
+
+        return $this->downloadChart($chartData, 'bar_chart.png');
+    }
+
+    public function generatePieChart(array $summary): ?string
+    {
+        if ($this->skipRemoteCharts()) {
+            return null;
+        }
+
+        $chartData = [
+            'type' => 'pie',
+            'data' => [
+                'labels' => ['Expenses', 'Reimbursements'],
+                'datasets' => [[
+                    'data' => [
+                        $summary['totalExpenses'] ?? 0,
+                        $summary['totalReimbursements'] ?? 0,
+                    ],
+                    'backgroundColor' => ['#e74c3c', '#8e44ad'],
+                ]],
+            ],
+        ];
+
+        return $this->downloadChart($chartData, 'pie_chart.png');
+    }
+
+    private function downloadChart(array $chartData, string $filename): ?string
+    {
+        $baseUrl = 'https://quickchart.io/chart?c=';
+        $url = $baseUrl . urlencode(json_encode($chartData));
+        $targetDir = storage_path('app/reports');
+        if (!is_dir($targetDir) && !mkdir($targetDir, 0775, true) && !is_dir($targetDir)) {
+            return null;
+        }
+
+        try {
+            $contents = @file_get_contents($url);
+            if ($contents === false) {
+                return null;
+            }
+            $path = $targetDir . DIRECTORY_SEPARATOR . $filename;
+            file_put_contents($path, $contents);
+            return $path;
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+    private function skipRemoteCharts(): bool
+    {
+        if (app()->environment('testing')) {
+            return true;
+        }
+
+        return (bool) config('services.quickchart.disabled', false);
+    }
+}
diff --git a/app/Services/Finance/FinancialDonationRecipientService.php b/app/Services/Finance/FinancialDonationRecipientService.php
new file mode 100644
index 00000000..8178e02f
--- /dev/null
+++ b/app/Services/Finance/FinancialDonationRecipientService.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Services\Finance;
+
+class FinancialDonationRecipientService
+{
+    public const SPECIAL_RECIPIENTS = [
+        990001 => 'Masjid',
+        990002 => 'Donation',
+    ];
+
+    public function recipientIds(): array
+    {
+        return array_map('intval', array_keys(self::SPECIAL_RECIPIENTS));
+    }
+}
diff --git a/app/Services/Finance/FinancialPaymentService.php b/app/Services/Finance/FinancialPaymentService.php
new file mode 100644
index 00000000..5f55bdf7
--- /dev/null
+++ b/app/Services/Finance/FinancialPaymentService.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Services\Finance;
+
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class FinancialPaymentService
+{
+    public function paymentsByInvoice(?string $schoolYear, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = $this->applyPaymentFilters($this->buildPaymentQuery($schoolYear, $dateFrom, $dateTo));
+
+        return $query
+            ->selectRaw('invoice_id, SUM(paid_amount) AS paid_amount')
+            ->whereNotNull('invoice_id')
+            ->groupBy('invoice_id')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    public function paymentBreakdown(?string $schoolYear, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = $this->applyPaymentFilters($this->buildPaymentQuery($schoolYear, $dateFrom, $dateTo));
+
+        $rows = $query
+            ->selectRaw("
+                invoice_id,
+                CASE
+                    WHEN LOWER(TRIM(payment_method)) = 'cash' THEN 'cash'
+                    WHEN LOWER(TRIM(payment_method)) IN ('check','cheque') THEN 'check'
+                    WHEN LOWER(TRIM(payment_method)) IN ('credit','card','credit card','debit','debit card','visa','mastercard') THEN 'credit'
+                    ELSE 'other'
+                END AS method,
+                SUM(paid_amount) AS amount
+            ")
+            ->whereNotNull('invoice_id')
+            ->groupBy('invoice_id', 'method')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $breakdown = [];
+        foreach ($rows as $row) {
+            $invoiceId = (int) ($row['invoice_id'] ?? 0);
+            if ($invoiceId <= 0) {
+                continue;
+            }
+            $method = (string) ($row['method'] ?? '');
+            $amount = (float) ($row['amount'] ?? 0);
+            if (!isset($breakdown[$invoiceId])) {
+                $breakdown[$invoiceId] = [];
+            }
+            $breakdown[$invoiceId][$method] = $amount;
+        }
+
+        return $breakdown;
+    }
+
+    public function paymentTotals(?string $schoolYear, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = $this->applyPaymentFilters($this->buildPaymentQuery($schoolYear, $dateFrom, $dateTo));
+
+        $row = (array) $query
+            ->selectRaw("
+                SUM(paid_amount) AS total_all,
+                SUM(CASE WHEN LOWER(TRIM(payment_method)) = 'cash' THEN paid_amount ELSE 0 END) AS total_cash,
+                SUM(CASE WHEN LOWER(TRIM(payment_method)) IN ('check','cheque') THEN paid_amount ELSE 0 END) AS total_check,
+                SUM(CASE WHEN LOWER(TRIM(payment_method)) IN ('credit','card','credit card','debit','debit card','visa','mastercard') THEN paid_amount ELSE 0 END) AS total_credit
+            ")
+            ->whereNotNull('invoice_id')
+            ->first();
+
+        return [
+            'total_all' => (float) ($row['total_all'] ?? 0),
+            'total_cash' => (float) ($row['total_cash'] ?? 0),
+            'total_check' => (float) ($row['total_check'] ?? 0),
+            'total_credit' => (float) ($row['total_credit'] ?? 0),
+        ];
+    }
+
+    private function buildPaymentQuery(?string $schoolYear, ?string $dateFrom, ?string $dateTo): Builder
+    {
+        $query = DB::table('payments');
+
+        if (!empty($schoolYear)) {
+            $query->where('school_year', $schoolYear);
+        }
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(payment_date) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(payment_date) <= ?', [$dateTo]);
+        }
+
+        return $query;
+    }
+
+    private function applyPaymentFilters(Builder $query): Builder
+    {
+        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+
+        if (Schema::hasColumn('payments', 'status')) {
+            $query->where(function ($q) use ($exclude) {
+                $q->whereNotIn('status', $exclude)->orWhereNull('status');
+            });
+        }
+
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $query->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        return $query;
+    }
+}
diff --git a/app/Services/Finance/FinancialPdfReportService.php b/app/Services/Finance/FinancialPdfReportService.php
new file mode 100644
index 00000000..0f7c28b1
--- /dev/null
+++ b/app/Services/Finance/FinancialPdfReportService.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Services\Finance;
+
+class FinancialPdfReportService
+{
+    public function __construct(private FinancialChartService $charts)
+    {
+    }
+
+    public function buildPdf(array $summary): string
+    {
+        $pdf = new \FPDF();
+        $pdf->AddPage();
+        $pdf->SetFont('Arial', 'B', 16);
+        $pdf->Cell(0, 10, 'Financial Report for School Year: ' . ($summary['schoolYear'] ?? ''), 0, 1, 'C');
+
+        $pdf->Ln(10);
+        $pdf->SetFont('Arial', 'B', 12);
+        $pdf->Cell(130, 10, 'Description', 1);
+        $pdf->Cell(60, 10, 'Amount (USD)', 1);
+        $pdf->Ln();
+
+        $rows = [
+            'Total Charges' => $summary['totalCharges'] ?? 0,
+            'Total Extra Charges' => $summary['totalExtraCharges'] ?? 0,
+            'Total Discounts' => $summary['totalDiscounts'] ?? 0,
+            'Total Refunds' => $summary['totalRefunds'] ?? 0,
+            'Total Expenses' => $summary['totalExpenses'] ?? 0,
+            'Total Reimbursements' => $summary['totalReimbursements'] ?? 0,
+            'Donation to School (Masjid/Donation reimbursements)' => $summary['donationToSchool'] ?? 0,
+            'Net Amount (Earned Income)' => $summary['netAmount'] ?? 0,
+            'Amount Collected (Paid)' => $summary['amountCollected'] ?? 0,
+            'Amount Unpaid (Outstanding)' => $summary['totalUnpaid'] ?? 0,
+        ];
+
+        $pdf->SetFont('Arial', '', 11);
+        foreach ($rows as $label => $amount) {
+            $pdf->Cell(130, 10, $label, 1);
+            $pdf->Cell(60, 10, '$' . number_format((float) $amount, 2), 1);
+            $pdf->Ln();
+        }
+
+        $barChart = $this->charts->generateBarChart($summary);
+        if (!empty($barChart) && file_exists($barChart)) {
+            $pdf->Ln(10);
+            $pdf->SetFont('Arial', 'B', 12);
+            $pdf->Cell(0, 10, 'Summary Graph', 0, 1);
+            $pdf->Image($barChart, null, null, 180);
+        }
+
+        $pieChart = $this->charts->generatePieChart($summary);
+        if (!empty($pieChart) && file_exists($pieChart)) {
+            $pdf->Ln(10);
+            $pdf->SetFont('Arial', 'B', 12);
+            $pdf->Cell(0, 10, 'Expense Breakdown', 0, 1);
+            $pdf->Image($pieChart, null, null, 120);
+        }
+
+        return $pdf->Output('S');
+    }
+}
diff --git a/app/Services/Finance/FinancialReportService.php b/app/Services/Finance/FinancialReportService.php
new file mode 100644
index 00000000..16ab30ee
--- /dev/null
+++ b/app/Services/Finance/FinancialReportService.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Services\Finance;
+
+use Illuminate\Support\Facades\DB;
+
+class FinancialReportService
+{
+    public function __construct(
+        private FinancialPaymentService $payments,
+        private FinancialSchoolYearService $schoolYears
+    ) {
+    }
+
+    public function getReport(?string $dateFrom, ?string $dateTo, ?string $schoolYear): array
+    {
+        $invoiceQuery = DB::table('invoices')
+            ->selectRaw("invoices.*, CONCAT(users.firstname, ' ', users.lastname) AS parent_name")
+            ->join('users', 'users.id', '=', 'invoices.parent_id');
+
+        $refundQuery = DB::table('refunds');
+        $discountQuery = DB::table('discount_usages');
+        $expenseQuery = DB::table('expenses');
+        $reimbQuery = DB::table('reimbursements');
+
+        if (!empty($schoolYear)) {
+            $invoiceQuery->where('invoices.school_year', $schoolYear);
+            $refundQuery->where('school_year', $schoolYear);
+            $discountQuery->where('school_year', $schoolYear);
+            $expenseQuery->where('school_year', $schoolYear);
+            $reimbQuery->where('school_year', $schoolYear);
+        }
+
+        if (!empty($dateFrom)) {
+            $invoiceQuery->whereRaw('DATE(COALESCE(invoices.issue_date, invoices.created_at)) >= ?', [$dateFrom]);
+            $refundQuery->whereRaw('DATE(COALESCE(refunded_at, created_at)) >= ?', [$dateFrom]);
+            $discountQuery->whereRaw('DATE(COALESCE(used_at, created_at)) >= ?', [$dateFrom]);
+            $expenseQuery->whereRaw('DATE(created_at) >= ?', [$dateFrom]);
+            $reimbQuery->whereRaw('DATE(created_at) >= ?', [$dateFrom]);
+        }
+
+        if (!empty($dateTo)) {
+            $invoiceQuery->whereRaw('DATE(COALESCE(invoices.issue_date, invoices.created_at)) <= ?', [$dateTo]);
+            $refundQuery->whereRaw('DATE(COALESCE(refunded_at, created_at)) <= ?', [$dateTo]);
+            $discountQuery->whereRaw('DATE(COALESCE(used_at, created_at)) <= ?', [$dateTo]);
+            $expenseQuery->whereRaw('DATE(created_at) <= ?', [$dateTo]);
+            $reimbQuery->whereRaw('DATE(created_at) <= ?', [$dateTo]);
+        }
+
+        $invoices = $invoiceQuery->get()->map(fn ($row) => (array) $row)->all();
+
+        $payments = $this->payments->paymentsByInvoice($schoolYear, $dateFrom, $dateTo);
+        $paymentBreakdown = $this->payments->paymentBreakdown($schoolYear, $dateFrom, $dateTo);
+        $paymentTotals = $this->payments->paymentTotals($schoolYear, $dateFrom, $dateTo);
+
+        $refunds = $refundQuery
+            ->selectRaw('invoice_id, school_year, SUM(refund_paid_amount) AS total_refunded')
+            ->whereNotNull('invoice_id')
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->groupBy('invoice_id', 'school_year')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $discounts = $discountQuery
+            ->selectRaw('invoice_id, school_year, SUM(discount_amount) AS discount_amount')
+            ->whereNotNull('invoice_id')
+            ->groupBy('invoice_id', 'school_year')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $expenses = $expenseQuery
+            ->selectRaw('category, SUM(amount) AS total_amount')
+            ->groupBy('category')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $reimbursements = $reimbQuery
+            ->selectRaw('status, SUM(amount) AS total_amount')
+            ->groupBy('status')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $schoolYears = $this->schoolYears->listYears($schoolYear);
+
+        return [
+            'selectedYear' => $schoolYear,
+            'dateFrom' => $dateFrom,
+            'dateTo' => $dateTo,
+            'schoolYears' => $schoolYears,
+            'invoices' => $invoices,
+            'payments' => $payments,
+            'paymentBreakdown' => $paymentBreakdown,
+            'paymentTotals' => $paymentTotals,
+            'refunds' => $refunds,
+            'expenses' => $expenses,
+            'reimbursements' => $reimbursements,
+            'discounts' => $discounts,
+        ];
+    }
+}
diff --git a/app/Services/Finance/FinancialSchoolYearService.php b/app/Services/Finance/FinancialSchoolYearService.php
new file mode 100644
index 00000000..2cb61a51
--- /dev/null
+++ b/app/Services/Finance/FinancialSchoolYearService.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Services\Finance;
+
+use Illuminate\Support\Facades\DB;
+
+class FinancialSchoolYearService
+{
+    public function listYears(?string $fallbackYear = null): array
+    {
+        $years = DB::table('invoices')
+            ->select('school_year')
+            ->whereNotNull('school_year')
+            ->distinct()
+            ->orderBy('school_year', 'DESC')
+            ->pluck('school_year')
+            ->map(static fn ($val) => (string) $val)
+            ->filter(static fn ($val) => $val !== '')
+            ->values()
+            ->all();
+
+        if (empty($years) && !empty($fallbackYear)) {
+            $years[] = (string) $fallbackYear;
+        }
+
+        return $years;
+    }
+}
diff --git a/app/Services/Finance/FinancialSummaryService.php b/app/Services/Finance/FinancialSummaryService.php
new file mode 100644
index 00000000..3583ff8b
--- /dev/null
+++ b/app/Services/Finance/FinancialSummaryService.php
@@ -0,0 +1,479 @@
+<?php
+
+namespace App\Services\Finance;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class FinancialSummaryService
+{
+    public function __construct(
+        private FinancialDonationRecipientService $donationRecipients
+    ) {
+    }
+
+    public function getSummary(?string $dateFrom, ?string $dateTo, ?string $schoolYear): array
+    {
+        $schoolYear = $schoolYear ?: (Configuration::getConfig('school_year') ?? date('Y'));
+        $derivedDateFrom = null;
+        $derivedDateTo = null;
+
+        if (!empty($schoolYear) && empty($dateFrom) && empty($dateTo)) {
+            if (preg_match('/^(\\d{4})[^\\d]?(\\d{4})$/', $schoolYear, $m)) {
+                $derivedDateFrom = $m[1] . '-01-01';
+                $derivedDateTo = $m[2] . '-12-31';
+            }
+        }
+
+        $invoiceDateFrom = $dateFrom ?: $derivedDateFrom;
+        $invoiceDateTo = $dateTo ?: $derivedDateTo;
+
+        $invoiceQuery = DB::table('invoices')->where('school_year', $schoolYear);
+        if (!empty($invoiceDateFrom)) {
+            $invoiceQuery->whereRaw('DATE(COALESCE(issue_date, created_at)) >= ?', [$invoiceDateFrom]);
+        }
+        if (!empty($invoiceDateTo)) {
+            $invoiceQuery->whereRaw('DATE(COALESCE(issue_date, created_at)) <= ?', [$invoiceDateTo]);
+        }
+        $invoices = $invoiceQuery->get()->map(fn ($row) => (array) $row)->all();
+        $totalCharges = array_sum(array_map(static fn ($row) => (float) ($row['total_amount'] ?? 0), $invoices));
+
+        $invoiceIds = array_values(array_unique(array_filter(array_map(static function ($row) {
+            $id = (int) ($row['id'] ?? 0);
+            return $id > 0 ? $id : null;
+        }, $invoices))));
+
+        $totalExtraCharges = $this->sumAdditionalCharges($schoolYear, $dateFrom, $dateTo);
+        $extraByParent = $this->extraChargesByParent($schoolYear, $dateFrom, $dateTo);
+        $extraChargesUnapplied = array_sum($extraByParent);
+        $totalCharges += $extraChargesUnapplied;
+
+        $totalPaid = $this->sumPayments($schoolYear, $invoiceDateFrom, $invoiceDateTo);
+
+        $paidByInvoice = [];
+        $discountByInvoice = [];
+        $refundByInvoice = [];
+        if (!empty($invoiceIds)) {
+            $paidByInvoice = $this->paymentsByInvoiceIds($invoiceIds, $schoolYear, $invoiceDateFrom, $invoiceDateTo);
+            $discountByInvoice = $this->discountsByInvoiceIds($invoiceIds, $dateFrom, $dateTo);
+            $refundByInvoice = $this->refundsByInvoiceIds($invoiceIds, $dateFrom, $dateTo);
+        }
+
+        $totalExpenses = $this->sumExpenses($schoolYear, $invoiceDateFrom, $invoiceDateTo);
+        $totalReimbursements = $this->sumReimbursements($schoolYear, $invoiceDateFrom, $invoiceDateTo);
+
+        $donationToSchool = $this->sumDonationToSchool($schoolYear, $invoiceDateFrom, $invoiceDateTo);
+        $totalReimbursements = max(0.0, $totalReimbursements - $donationToSchool['donationReimb']);
+
+        $totalRefunds = $this->sumRefunds($schoolYear, $dateFrom, $dateTo);
+        $totalDiscounts = $this->sumDiscounts($schoolYear, $dateFrom, $dateTo);
+
+        $totalUnpaid = $this->sumUnpaidBalances($invoices, $paidByInvoice, $discountByInvoice, $refundByInvoice, $extraByParent);
+
+        $amountCollected = $totalPaid;
+        $netAmount = $totalCharges - $totalDiscounts - $totalRefunds;
+
+        return [
+            'schoolYear' => $schoolYear,
+            'dateFrom' => $dateFrom,
+            'dateTo' => $dateTo,
+            'totalCharges' => $totalCharges,
+            'totalExtraCharges' => $totalExtraCharges,
+            'totalDiscounts' => $totalDiscounts,
+            'totalRefunds' => $totalRefunds,
+            'totalExpenses' => $totalExpenses,
+            'totalReimbursements' => $totalReimbursements,
+            'donationToSchool' => $donationToSchool['donationToSchool'],
+            'totalPaid' => $totalPaid,
+            'amountCollected' => $amountCollected,
+            'totalUnpaid' => $totalUnpaid,
+            'netAmount' => $netAmount,
+        ];
+    }
+
+    private function sumAdditionalCharges(string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $query = DB::table('additional_charges as ac')
+            ->selectRaw('COALESCE(SUM(ac.amount), 0) AS amount')
+            ->where('ac.school_year', $schoolYear)
+            ->where('ac.status !=', 'void');
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(ac.due_date) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(ac.due_date) <= ?', [$dateTo]);
+        }
+
+        $row = (array) $query->first();
+        return (float) ($row['amount'] ?? 0);
+    }
+
+    private function extraChargesByParent(string $schoolYear, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = DB::table('additional_charges as ac')
+            ->selectRaw('ac.parent_id, COALESCE(SUM(ac.amount), 0) AS amount')
+            ->where('ac.school_year', $schoolYear)
+            ->where('ac.status !=', 'void')
+            ->where(function ($q) {
+                $q->whereNull('ac.invoice_id')
+                    ->orWhere('ac.invoice_id', 0)
+                    ->orWhere('ac.status !=', 'applied');
+            })
+            ->groupBy('ac.parent_id');
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(ac.due_date) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(ac.due_date) <= ?', [$dateTo]);
+        }
+
+        $rows = $query->get()->map(fn ($row) => (array) $row)->all();
+        $extraByParent = [];
+        foreach ($rows as $row) {
+            $parentId = (int) ($row['parent_id'] ?? 0);
+            $amount = (float) ($row['amount'] ?? 0);
+            if ($parentId > 0 && abs($amount) > 0.00001) {
+                $extraByParent[$parentId] = $amount;
+            }
+        }
+
+        return $extraByParent;
+    }
+
+    private function sumPayments(string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $query = DB::table('payments')->where('school_year', $schoolYear);
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(payment_date) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(payment_date) <= ?', [$dateTo]);
+        }
+
+        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+        if (Schema::hasColumn('payments', 'status')) {
+            $query->where(function ($q) use ($exclude) {
+                $q->whereNotIn('status', $exclude)->orWhereNull('status');
+            });
+        }
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $query->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        $row = (array) $query->selectRaw('COALESCE(SUM(paid_amount), 0) AS paid_amount')->first();
+        return (float) ($row['paid_amount'] ?? 0);
+    }
+
+    private function paymentsByInvoiceIds(array $invoiceIds, string $schoolYear, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = DB::table('payments')
+            ->selectRaw('invoice_id, COALESCE(SUM(paid_amount), 0) AS total_paid')
+            ->whereIn('invoice_id', $invoiceIds)
+            ->where('school_year', $schoolYear);
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(payment_date) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(payment_date) <= ?', [$dateTo]);
+        }
+
+        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+        if (Schema::hasColumn('payments', 'status')) {
+            $query->where(function ($q) use ($exclude) {
+                $q->whereNotIn('status', $exclude)->orWhereNull('status');
+            });
+        }
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $query->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        $rows = $query->groupBy('invoice_id')->get()->map(fn ($row) => (array) $row)->all();
+        $map = [];
+        foreach ($rows as $row) {
+            $invoiceId = (int) ($row['invoice_id'] ?? 0);
+            if ($invoiceId > 0) {
+                $map[$invoiceId] = (float) ($row['total_paid'] ?? 0);
+            }
+        }
+        return $map;
+    }
+
+    private function discountsByInvoiceIds(array $invoiceIds, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = DB::table('discount_usages')
+            ->selectRaw('invoice_id, COALESCE(SUM(discount_amount),0) AS total_disc')
+            ->whereIn('invoice_id', $invoiceIds);
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(COALESCE(used_at, created_at)) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(COALESCE(used_at, created_at)) <= ?', [$dateTo]);
+        }
+
+        $rows = $query->groupBy('invoice_id')->get()->map(fn ($row) => (array) $row)->all();
+        $map = [];
+        foreach ($rows as $row) {
+            $invoiceId = (int) ($row['invoice_id'] ?? 0);
+            if ($invoiceId > 0) {
+                $map[$invoiceId] = (float) ($row['total_disc'] ?? 0);
+            }
+        }
+        return $map;
+    }
+
+    private function refundsByInvoiceIds(array $invoiceIds, ?string $dateFrom, ?string $dateTo): array
+    {
+        $query = DB::table('refunds')
+            ->selectRaw('invoice_id, COALESCE(SUM(refund_paid_amount),0) AS total_refund')
+            ->whereIn('invoice_id', $invoiceIds)
+            ->whereIn('status', ['Partial', 'Paid']);
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(COALESCE(refunded_at, created_at)) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(COALESCE(refunded_at, created_at)) <= ?', [$dateTo]);
+        }
+
+        $rows = $query->groupBy('invoice_id')->get()->map(fn ($row) => (array) $row)->all();
+        $map = [];
+        foreach ($rows as $row) {
+            $invoiceId = (int) ($row['invoice_id'] ?? 0);
+            if ($invoiceId > 0) {
+                $map[$invoiceId] = (float) ($row['total_refund'] ?? 0);
+            }
+        }
+        return $map;
+    }
+
+    private function sumExpenses(string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $query = DB::table('expenses')->where('school_year', $schoolYear);
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(created_at) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(created_at) <= ?', [$dateTo]);
+        }
+
+        $row = (array) $query->selectRaw('COALESCE(SUM(amount), 0) AS amount')->first();
+        return (float) ($row['amount'] ?? 0);
+    }
+
+    private function sumReimbursements(string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $normalizedYear = preg_replace('/[^0-9]/', '', (string) $schoolYear);
+
+        $query = DB::table('reimbursements as r')
+            ->selectRaw('COALESCE(SUM(r.amount),0) AS amount')
+            ->leftJoin('expenses as e', 'e.id', '=', 'r.expense_id');
+
+        if (!empty($schoolYear)) {
+            $query->where(function ($q) use ($schoolYear, $normalizedYear) {
+                $q->where(function ($q2) use ($schoolYear, $normalizedYear) {
+                    $q2->where('r.school_year', $schoolYear)
+                        ->orWhereRaw(
+                            "REPLACE(REPLACE(REPLACE(REPLACE(r.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '') = ?",
+                            [$normalizedYear]
+                        );
+                })->orWhere(function ($q2) use ($schoolYear, $normalizedYear) {
+                    $q2->whereNull('r.school_year')
+                        ->where(function ($q3) use ($schoolYear, $normalizedYear) {
+                            $q3->where('e.school_year', $schoolYear)
+                                ->orWhereRaw(
+                                    "REPLACE(REPLACE(REPLACE(REPLACE(e.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '') = ?",
+                                    [$normalizedYear]
+                                );
+                        });
+                });
+            });
+        }
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(COALESCE(r.created_at, e.created_at)) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(COALESCE(r.created_at, e.created_at)) <= ?', [$dateTo]);
+        }
+
+        $row = (array) $query->first();
+        $total = (float) ($row['amount'] ?? 0);
+
+        $batchFallback = DB::table('reimbursement_batch_items as bi')
+            ->selectRaw('COALESCE(SUM(e.amount),0) AS amount')
+            ->join('reimbursement_batches as b', 'b.id', '=', 'bi.batch_id')
+            ->join('expenses as e', 'e.id', '=', 'bi.expense_id')
+            ->leftJoin('reimbursements as r', 'r.expense_id', '=', 'e.id')
+            ->where('b.status', 'closed')
+            ->whereNull('bi.unassigned_at')
+            ->whereNull('r.id');
+
+        if (!empty($schoolYear)) {
+            $batchFallback->where(function ($q) use ($schoolYear, $normalizedYear) {
+                $q->where('e.school_year', $schoolYear)
+                    ->orWhereRaw(
+                        "REPLACE(REPLACE(REPLACE(REPLACE(e.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '') = ?",
+                        [$normalizedYear]
+                    );
+            });
+        }
+
+        if (!empty($dateFrom)) {
+            $batchFallback->whereRaw('DATE(COALESCE(e.created_at, b.closed_at)) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $batchFallback->whereRaw('DATE(COALESCE(e.created_at, b.closed_at)) <= ?', [$dateTo]);
+        }
+
+        $fallbackRow = (array) $batchFallback->first();
+        $total += (float) ($fallbackRow['amount'] ?? 0);
+
+        return $total;
+    }
+
+    private function sumDonationToSchool(string $schoolYear, ?string $dateFrom, ?string $dateTo): array
+    {
+        $expenseQuery = DB::table('expenses')
+            ->where('school_year', $schoolYear)
+            ->where('category', 'Donation');
+
+        if (!empty($dateFrom)) {
+            $expenseQuery->whereRaw('DATE(created_at) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $expenseQuery->whereRaw('DATE(created_at) <= ?', [$dateTo]);
+        }
+
+        $expenseRow = (array) $expenseQuery->selectRaw('COALESCE(SUM(amount),0) AS amount')->first();
+        $donationExpense = (float) ($expenseRow['amount'] ?? 0);
+
+        $donationReimb = 0.0;
+        $recipientIds = $this->donationRecipients->recipientIds();
+        if (!empty($recipientIds)) {
+            $normalizedYear = preg_replace('/[^0-9]/', '', (string) $schoolYear);
+            $donationQuery = DB::table('reimbursements as r')
+                ->selectRaw('COALESCE(SUM(r.amount),0) AS amount')
+                ->leftJoin('expenses as e', 'e.id', '=', 'r.expense_id')
+                ->whereIn('r.reimbursed_to', $recipientIds);
+
+            if (!empty($schoolYear)) {
+                $donationQuery->where(function ($q) use ($schoolYear, $normalizedYear) {
+                    $q->where(function ($q2) use ($schoolYear, $normalizedYear) {
+                        $q2->where('r.school_year', $schoolYear)
+                            ->orWhereRaw(
+                                "REPLACE(REPLACE(REPLACE(REPLACE(r.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '') = ?",
+                                [$normalizedYear]
+                            );
+                    })->orWhere(function ($q2) use ($schoolYear, $normalizedYear) {
+                        $q2->whereNull('r.school_year')
+                            ->where(function ($q3) use ($schoolYear, $normalizedYear) {
+                                $q3->where('e.school_year', $schoolYear)
+                                    ->orWhereRaw(
+                                        "REPLACE(REPLACE(REPLACE(REPLACE(e.school_year, ' ', ''), '-', ''), '/', ''), '\\\\', '') = ?",
+                                        [$normalizedYear]
+                                    );
+                            });
+                    });
+                });
+            }
+
+            if (!empty($dateFrom)) {
+                $donationQuery->whereRaw('DATE(COALESCE(r.created_at, e.created_at)) >= ?', [$dateFrom]);
+            }
+            if (!empty($dateTo)) {
+                $donationQuery->whereRaw('DATE(COALESCE(r.created_at, e.created_at)) <= ?', [$dateTo]);
+            }
+
+            $donationRow = (array) $donationQuery->first();
+            $donationReimb = (float) ($donationRow['amount'] ?? 0);
+        }
+
+        return [
+            'donationToSchool' => $donationExpense + $donationReimb,
+            'donationReimb' => $donationReimb,
+        ];
+    }
+
+    private function sumRefunds(string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $query = DB::table('refunds')
+            ->where('school_year', $schoolYear)
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->whereNotNull('refund_paid_amount');
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(COALESCE(refunded_at, created_at)) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(COALESCE(refunded_at, created_at)) <= ?', [$dateTo]);
+        }
+
+        $row = (array) $query->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS refund_paid_amount')->first();
+        return (float) ($row['refund_paid_amount'] ?? 0);
+    }
+
+    private function sumDiscounts(string $schoolYear, ?string $dateFrom, ?string $dateTo): float
+    {
+        $query = DB::table('discount_usages as du')
+            ->join('invoices as i', 'i.id', '=', 'du.invoice_id')
+            ->where('i.school_year', $schoolYear);
+
+        if (!empty($dateFrom)) {
+            $query->whereRaw('DATE(COALESCE(du.used_at, du.created_at)) >= ?', [$dateFrom]);
+        }
+        if (!empty($dateTo)) {
+            $query->whereRaw('DATE(COALESCE(du.used_at, du.created_at)) <= ?', [$dateTo]);
+        }
+
+        $row = (array) $query->selectRaw('COALESCE(SUM(du.discount_amount),0) AS discount_amount')->first();
+        return (float) ($row['discount_amount'] ?? 0);
+    }
+
+    private function sumUnpaidBalances(array $invoices, array $paidByInvoice, array $discountByInvoice, array $refundByInvoice, array $extraByParent): float
+    {
+        $parentBalances = [];
+
+        foreach ($invoices as $inv) {
+            $invoiceId = (int) ($inv['id'] ?? 0);
+            $parentId = (int) ($inv['parent_id'] ?? 0);
+            if ($invoiceId <= 0 || $parentId <= 0) {
+                continue;
+            }
+            $total = (float) ($inv['total_amount'] ?? 0);
+            $paid = (float) ($paidByInvoice[$invoiceId] ?? 0);
+            $disc = (float) ($discountByInvoice[$invoiceId] ?? 0);
+            $ref = (float) ($refundByInvoice[$invoiceId] ?? 0);
+            $balance = max(0.0, round($total - $disc - $paid - $ref, 2));
+
+            if (!isset($parentBalances[$parentId])) {
+                $parentBalances[$parentId] = 0.0;
+            }
+            $parentBalances[$parentId] += $balance;
+        }
+
+        foreach ($extraByParent as $parentId => $extra) {
+            if (!isset($parentBalances[$parentId])) {
+                $parentBalances[$parentId] = 0.0;
+            }
+            $parentBalances[$parentId] += (float) $extra;
+        }
+
+        $totalUnpaid = 0.0;
+        foreach ($parentBalances as $balance) {
+            if ($balance > 0.00001) {
+                $totalUnpaid += $balance;
+            }
+        }
+
+        return $totalUnpaid;
+    }
+}
diff --git a/app/Services/Finance/FinancialUnpaidParentsService.php b/app/Services/Finance/FinancialUnpaidParentsService.php
new file mode 100644
index 00000000..90f702b4
--- /dev/null
+++ b/app/Services/Finance/FinancialUnpaidParentsService.php
@@ -0,0 +1,247 @@
+<?php
+
+namespace App\Services\Finance;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class FinancialUnpaidParentsService
+{
+    public function __construct(private FinancialSchoolYearService $schoolYears)
+    {
+    }
+
+    public function getUnpaidParents(?string $schoolYear): array
+    {
+        $schoolYear = trim((string) ($schoolYear ?? ''));
+        if ($schoolYear === '') {
+            $schoolYear = (string) (Configuration::getConfig('school_year') ?? date('Y'));
+        }
+
+        $schoolYears = $this->schoolYears->listYears($schoolYear);
+
+        $invRows = DB::table('invoices as i')
+            ->select('i.id', 'i.parent_id', 'i.total_amount', 'u.firstname', 'u.lastname', 'u.email')
+            ->join('users as u', 'u.id', '=', 'i.parent_id')
+            ->where('i.school_year', $schoolYear)
+            ->orderBy('i.parent_id', 'ASC')
+            ->orderBy('i.id', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $byParent = [];
+        $hasStatus = Schema::hasColumn('payments', 'status');
+        $hasVoid = Schema::hasColumn('payments', 'is_void');
+
+        foreach ($invRows as $row) {
+            $invoiceId = (int) ($row['id'] ?? 0);
+            $parentId = (int) ($row['parent_id'] ?? 0);
+            if ($invoiceId <= 0 || $parentId <= 0) {
+                continue;
+            }
+
+            $paidQuery = DB::table('payments')
+                ->selectRaw('COALESCE(SUM(paid_amount),0) AS tot')
+                ->where('invoice_id', $invoiceId);
+            if ($hasStatus) {
+                $paidQuery->where(function ($q) {
+                    $q->whereNotIn('status', [
+                        'void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled',
+                    ])->orWhereNull('status');
+                });
+            }
+            if ($hasVoid) {
+                $paidQuery->where(function ($q) {
+                    $q->where('is_void', 0)->orWhereNull('is_void');
+                });
+            }
+            $paidRow = (array) $paidQuery->first();
+            $paidSum = (float) ($paidRow['tot'] ?? 0);
+
+            $discRow = (array) DB::table('discount_usages')
+                ->selectRaw('COALESCE(SUM(discount_amount),0) AS tot')
+                ->where('invoice_id', $invoiceId)
+                ->first();
+            $discSum = (float) ($discRow['tot'] ?? 0);
+
+            $refRow = (array) DB::table('refunds')
+                ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS tot')
+                ->where('invoice_id', $invoiceId)
+                ->whereIn('status', ['Partial', 'Paid'])
+                ->first();
+            $refSum = (float) ($refRow['tot'] ?? 0);
+
+            $total = (float) ($row['total_amount'] ?? 0);
+            $balance = max(0.0, round($total - $discSum - $paidSum - $refSum, 2));
+
+            if (!isset($byParent[$parentId])) {
+                $byParent[$parentId] = [
+                    'parent_id' => $parentId,
+                    'firstname' => (string) ($row['firstname'] ?? ''),
+                    'lastname' => (string) ($row['lastname'] ?? ''),
+                    'email' => (string) ($row['email'] ?? ''),
+                    'total_invoice' => 0.0,
+                    'total_balance' => 0.0,
+                    'total_paid' => 0.0,
+                    'total_discount' => 0.0,
+                ];
+            }
+
+            $byParent[$parentId]['total_invoice'] += $total;
+            $byParent[$parentId]['total_balance'] += $balance;
+            $byParent[$parentId]['total_paid'] += $paidSum;
+            $byParent[$parentId]['total_discount'] += $discSum;
+        }
+
+        $extraRows = DB::table('additional_charges as ac')
+            ->selectRaw(
+                "ac.parent_id, u.firstname, u.lastname, u.email, COALESCE(SUM(ac.amount), 0) AS total_extra",
+                false
+            )
+            ->leftJoin('users as u', 'u.id', '=', 'ac.parent_id')
+            ->where('ac.school_year', $schoolYear)
+            ->where('ac.status !=', 'void')
+            ->where(function ($q) {
+                $q->whereNull('ac.invoice_id')
+                    ->orWhere('ac.invoice_id', 0)
+                    ->orWhere('ac.status !=', 'applied');
+            })
+            ->groupBy('ac.parent_id')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        foreach ($extraRows as $row) {
+            $parentId = (int) ($row['parent_id'] ?? 0);
+            if ($parentId <= 0) {
+                continue;
+            }
+            $extra = (float) ($row['total_extra'] ?? 0);
+            if (abs($extra) < 0.00001) {
+                continue;
+            }
+            if (!isset($byParent[$parentId])) {
+                $byParent[$parentId] = [
+                    'parent_id' => $parentId,
+                    'firstname' => (string) ($row['firstname'] ?? ''),
+                    'lastname' => (string) ($row['lastname'] ?? ''),
+                    'email' => (string) ($row['email'] ?? ''),
+                    'total_invoice' => 0.0,
+                    'total_balance' => 0.0,
+                    'total_paid' => 0.0,
+                    'total_discount' => 0.0,
+                ];
+            }
+            $byParent[$parentId]['total_invoice'] += $extra;
+            $byParent[$parentId]['total_balance'] += $extra;
+        }
+
+        $rows = [];
+        $installmentEndRaw = (string) (Configuration::getConfig('installment_date') ?? '');
+        $tzName = function_exists('user_timezone') ? (string) user_timezone() : config('app.timezone', 'UTC');
+        $tz = new \DateTimeZone($tzName);
+        $today = new \DateTimeImmutable('today', $tz);
+
+        $endDate = null;
+        if ($installmentEndRaw !== '') {
+            try {
+                $endDate = new \DateTimeImmutable($installmentEndRaw, $tz);
+            } catch (\Throwable $e) {
+                $endDate = null;
+            }
+        }
+
+        $monthsUntil = static function (? \DateTimeImmutable $end) use ($today): int {
+            if (!$end) {
+                return 0;
+            }
+            $y = (int) $end->format('Y') - (int) $today->format('Y');
+            $m = (int) $end->format('n') - (int) $today->format('n');
+            $months = $y * 12 + $m;
+            if ((int) $end->format('j') > (int) $today->format('j')) {
+                $months += 1;
+            }
+            return max(0, $months);
+        };
+
+        foreach ($byParent as $agg) {
+            $balance = (float) ($agg['total_balance'] ?? 0);
+            if ($balance <= 0.00001) {
+                continue;
+            }
+            $remMonths = $monthsUntil($endDate);
+            $remainingInstallments = max(1, $remMonths);
+            $instAmount = round($balance / $remainingInstallments, 2);
+
+            $rows[] = [
+                'parent_id' => (int) ($agg['parent_id'] ?? 0),
+                'firstname' => (string) ($agg['firstname'] ?? ''),
+                'lastname' => (string) ($agg['lastname'] ?? ''),
+                'email' => (string) ($agg['email'] ?? ''),
+                'total_invoice' => (float) ($agg['total_invoice'] ?? 0),
+                'total_balance' => $balance,
+                'total_discount' => (float) ($agg['total_discount'] ?? 0),
+                'remaining_installments' => $remainingInstallments,
+                'installment_amount' => $instAmount,
+            ];
+        }
+
+        usort($rows, static fn ($a, $b) => $b['total_balance'] <=> $a['total_balance']);
+
+        $nextInstallment = (new \DateTime('now', $tz))
+            ->modify('first day of next month')
+            ->format('Y-m-d');
+
+        $parentIds = array_values(array_unique(array_map(static fn ($row) => (int) ($row['parent_id'] ?? 0), $rows)));
+        $hasPayments = [];
+        $paidTotals = [];
+        $paymentCounts = [];
+        if (!empty($parentIds)) {
+            $pRows = DB::table('payments')
+                ->selectRaw('parent_id, SUM(paid_amount) AS total_paid, COUNT(*) AS payment_count')
+                ->whereIn('parent_id', $parentIds)
+                ->where('school_year', $schoolYear)
+                ->groupBy('parent_id')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($pRows as $row) {
+                $parentId = (int) ($row['parent_id'] ?? 0);
+                if ($parentId > 0) {
+                    $hasPayments[$parentId] = true;
+                    $paidTotals[$parentId] = (float) ($row['total_paid'] ?? 0);
+                    $paymentCounts[$parentId] = (int) ($row['payment_count'] ?? 0);
+                }
+            }
+        }
+
+        $results = array_map(function (array $row) use ($hasPayments, $paidTotals, $paymentCounts, $nextInstallment) {
+            $parentId = (int) ($row['parent_id'] ?? 0);
+            $name = trim((string) ($row['firstname'] ?? '') . ' ' . (string) ($row['lastname'] ?? ''));
+            return [
+                'parent_id' => $parentId,
+                'parent_name' => $name,
+                'email' => (string) ($row['email'] ?? ''),
+                'total_invoice' => (float) ($row['total_invoice'] ?? 0),
+                'total_balance' => (float) ($row['total_balance'] ?? 0),
+                'total_discount' => (float) ($row['total_discount'] ?? 0),
+                'remaining_installments' => (int) ($row['remaining_installments'] ?? 0),
+                'installment_amount' => (float) ($row['installment_amount'] ?? 0),
+                'type' => isset($hasPayments[$parentId]) ? 'installment' : 'no_payment',
+                'total_paid' => isset($paidTotals[$parentId]) ? (float) $paidTotals[$parentId] : 0.0,
+                'payment_count' => isset($paymentCounts[$parentId]) ? (int) $paymentCounts[$parentId] : 0,
+                'has_installment' => isset($hasPayments[$parentId]) ? 1 : 0,
+                'next_installment' => $nextInstallment,
+            ];
+        }, $rows);
+
+        return [
+            'schoolYear' => $schoolYear,
+            'schoolYears' => $schoolYears,
+            'results' => $results,
+        ];
+    }
+}
diff --git a/app/Services/Grading/GradingBelowSixtyService.php b/app/Services/Grading/GradingBelowSixtyService.php
new file mode 100644
index 00000000..8c9cca94
--- /dev/null
+++ b/app/Services/Grading/GradingBelowSixtyService.php
@@ -0,0 +1,403 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\CurrentFlag;
+use App\Models\ParentMeetingSchedule;
+use App\Models\ScoreComment;
+use App\Models\Student;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
+use RuntimeException;
+
+class GradingBelowSixtyService
+{
+    public function listRows(string $schoolYear, string $semester): array
+    {
+        $semesterKey = strtolower(trim($semester));
+        $rows = DB::table('semester_scores as ss')
+            ->select([
+                's.id as student_id',
+                's.school_id',
+                's.firstname',
+                's.lastname',
+                'cs.class_section_name',
+                'ss.homework_avg',
+                'ss.project_avg',
+                'ss.participation_score',
+                DB::raw('COALESCE(ss.test_avg, ss.quiz_avg) as test_avg'),
+                'ss.ptap_score',
+                'ss.attendance_score',
+                'ss.midterm_exam_score',
+                'ss.final_exam_score',
+                'ss.semester_score',
+            ])
+            ->join('students as s', 's.id', '=', 'ss.student_id')
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'ss.class_section_id')
+            ->where('s.is_active', 1)
+            ->where('ss.school_year', $schoolYear)
+            ->whereRaw('LOWER(TRIM(ss.semester)) = ?', [$semesterKey])
+            ->whereNotNull('ss.semester_score')
+            ->where('ss.semester_score', '<', 60)
+            ->orderBy('s.lastname', 'ASC')
+            ->orderBy('s.firstname', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        if (empty($rows)) {
+            return [];
+        }
+
+        $studentIds = array_values(array_unique(array_map(
+            static fn ($r) => (int) ($r['student_id'] ?? 0),
+            $rows
+        )));
+        $studentIds = array_values(array_filter($studentIds, static fn ($id) => $id > 0));
+
+        $commentMap = [];
+        if (!empty($studentIds)) {
+            $commentRows = ScoreComment::query()
+                ->select('student_id', 'comment', 'created_at')
+                ->where('score_type', 'general')
+                ->where('school_year', $schoolYear)
+                ->whereRaw('LOWER(TRIM(semester)) = ?', [$semesterKey])
+                ->whereIn('student_id', $studentIds)
+                ->orderBy('created_at', 'DESC')
+                ->get();
+            foreach ($commentRows as $row) {
+                $sid = (int) $row->student_id;
+                if ($sid > 0 && !isset($commentMap[$sid])) {
+                    $commentMap[$sid] = (string) ($row->comment ?? '');
+                }
+            }
+        }
+
+        $statusMap = [];
+        if (!empty($studentIds)) {
+            $flagRows = CurrentFlag::query()
+                ->select('student_id', 'flag_state')
+                ->where('flag', 'grade')
+                ->where('school_year', $schoolYear)
+                ->whereRaw('LOWER(TRIM(semester)) = ?', [$semesterKey])
+                ->whereIn('student_id', $studentIds)
+                ->get();
+            foreach ($flagRows as $row) {
+                $sid = (int) $row->student_id;
+                if ($sid > 0) {
+                    $statusMap[$sid] = (string) ($row->flag_state ?? '');
+                }
+            }
+        }
+
+        foreach ($rows as &$row) {
+            $sid = (int) ($row['student_id'] ?? 0);
+            $row['comment'] = $commentMap[$sid] ?? '';
+            $flagState = strtolower(trim((string) ($statusMap[$sid] ?? '')));
+            $row['status'] = ($flagState === 'closed' || $flagState === 'canceled') ? 'Closed' : 'Open';
+        }
+        unset($row);
+
+        return $rows;
+    }
+
+    public function emailContext(int $studentId, string $schoolYear, string $semester): array
+    {
+        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
+        if (empty($row)) {
+            throw new RuntimeException('Student record not found for the selected term.');
+        }
+
+        $studentName = trim((string) ($row['firstname'] ?? '') . ' ' . (string) ($row['lastname'] ?? ''));
+        $subject = $this->buildBelowSixtySubject($studentName, $semester, $schoolYear);
+        $parentName = $this->fetchBelowSixtyParentName($studentId);
+
+        $scores = [
+            'homework_avg' => $row['homework_avg'] ?? null,
+            'project_avg' => $row['project_avg'] ?? null,
+            'participation_score' => $row['participation_score'] ?? null,
+            'test_avg' => $row['test_avg'] ?? null,
+            'ptap_score' => $row['ptap_score'] ?? null,
+            'attendance_score' => $row['attendance_score'] ?? null,
+            'midterm_exam_score' => $row['midterm_exam_score'] ?? null,
+            'semester_score' => $row['semester_score'] ?? null,
+        ];
+
+        return [
+            'student_id' => $studentId,
+            'student_name' => $studentName !== '' ? $studentName : 'Student',
+            'parent_name' => $parentName,
+            'class_section_name' => $row['class_section_name'] ?? '',
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+            'scores' => $scores,
+            'comment' => $row['comment'] ?? '',
+            'subject' => $subject,
+        ];
+    }
+
+    public function sendEmail(array $payload): void
+    {
+        Event::dispatch('below60.email', $payload);
+    }
+
+    public function updateStatus(int $studentId, string $semester, string $schoolYear, string $status, string $note, ?int $userId): void
+    {
+        $status = ucfirst(strtolower($status));
+        if (!in_array($status, ['Open', 'Closed'], true)) {
+            throw new RuntimeException('Invalid status.');
+        }
+
+        $semesterKey = strtolower(trim($semester));
+        $existing = CurrentFlag::query()
+            ->where('student_id', $studentId)
+            ->where('flag', 'grade')
+            ->where('school_year', $schoolYear)
+            ->whereRaw('LOWER(TRIM(semester)) = ?', [$semesterKey])
+            ->first();
+
+        $now = now();
+
+        if ($existing) {
+            $data = [
+                'flag_state' => $status,
+                'flag_datetime' => $now,
+                'updated_at' => $now,
+            ];
+            if ($status === 'Open') {
+                $data['updated_by_open'] = $userId;
+                if ($note !== '') {
+                    $prev = (string) ($existing->open_description ?? '');
+                    $data['open_description'] = trim($prev . PHP_EOL . $note);
+                }
+            } else {
+                $data['updated_by_closed'] = $userId;
+                if ($note !== '') {
+                    $prev = (string) ($existing->close_description ?? '');
+                    $data['close_description'] = trim($prev . PHP_EOL . $note);
+                }
+            }
+            $existing->update($data);
+            return;
+        }
+
+        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
+        $studentName = trim((string) ($row['firstname'] ?? '') . ' ' . (string) ($row['lastname'] ?? ''));
+        $grade = (string) ($row['class_section_name'] ?? '');
+        $data = [
+            'student_id' => $studentId,
+            'student_name' => $studentName !== '' ? $studentName : 'Student',
+            'grade' => $grade,
+            'flag' => 'grade',
+            'flag_datetime' => $now,
+            'flag_state' => $status,
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+            'updated_at' => $now,
+        ];
+        if ($status === 'Open') {
+            $data['updated_by_open'] = $userId;
+            if ($note !== '') {
+                $data['open_description'] = $note;
+            }
+        } else {
+            $data['updated_by_closed'] = $userId;
+            if ($note !== '') {
+                $data['close_description'] = $note;
+            }
+        }
+
+        CurrentFlag::query()->create($data);
+    }
+
+    public function meetingContext(int $studentId, string $schoolYear, string $semester): array
+    {
+        $context = $this->fetchBelowSixtyMeetingContext($studentId, $schoolYear, $semester);
+        if (empty($context)) {
+            throw new RuntimeException('Student record not found for the selected term.');
+        }
+
+        return $context + [
+            'student_id' => $studentId,
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+        ];
+    }
+
+    public function saveMeeting(array $payload, ?int $userId): void
+    {
+        $studentId = (int) ($payload['student_id'] ?? 0);
+        $semester = (string) ($payload['semester'] ?? '');
+        $schoolYear = (string) ($payload['school_year'] ?? '');
+        $date = trim((string) ($payload['date'] ?? ''));
+        $time = trim((string) ($payload['time'] ?? ''));
+        $notes = trim((string) ($payload['notes'] ?? ''));
+
+        if ($studentId <= 0 || $semester === '' || $schoolYear === '' || $date === '') {
+            throw new RuntimeException('Missing required fields.');
+        }
+
+        $context = $this->fetchBelowSixtyMeetingContext($studentId, $schoolYear, $semester);
+        if (empty($context)) {
+            throw new RuntimeException('Student record not found for the selected term.');
+        }
+
+        ParentMeetingSchedule::query()->create([
+            'student_id' => $studentId,
+            'parent_user_id' => $context['parent_user_id'] ?? null,
+            'parent_name' => $context['parent_name'],
+            'student_name' => $context['student_name'],
+            'class_section_name' => $context['class_section_name'],
+            'date' => $date,
+            'time' => $time !== '' ? $time : null,
+            'notes' => $notes !== '' ? $notes : null,
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+            'status' => 'scheduled',
+            'created_by' => $userId,
+        ]);
+    }
+
+    private function fetchBelowSixtyEmailRow(int $studentId, string $schoolYear, string $semester): array
+    {
+        $semesterKey = strtolower(trim($semester));
+        $row = DB::table('semester_scores as ss')
+            ->select([
+                's.id as student_id',
+                's.firstname',
+                's.lastname',
+                'cs.class_section_name',
+                'ss.homework_avg',
+                'ss.project_avg',
+                'ss.participation_score',
+                DB::raw('COALESCE(ss.test_avg, ss.quiz_avg) as test_avg'),
+                'ss.ptap_score',
+                'ss.attendance_score',
+                'ss.midterm_exam_score',
+                'ss.semester_score',
+            ])
+            ->join('students as s', 's.id', '=', 'ss.student_id')
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'ss.class_section_id')
+            ->where('ss.school_year', $schoolYear)
+            ->where('ss.student_id', $studentId)
+            ->where('s.is_active', 1)
+            ->whereRaw('LOWER(TRIM(ss.semester)) = ?', [$semesterKey])
+            ->first();
+
+        if (!$row) {
+            return [];
+        }
+
+        $commentRow = ScoreComment::query()
+            ->select('comment')
+            ->where('score_type', 'general')
+            ->where('school_year', $schoolYear)
+            ->whereRaw('LOWER(TRIM(semester)) = ?', [$semesterKey])
+            ->where('student_id', $studentId)
+            ->orderBy('created_at', 'DESC')
+            ->first();
+
+        $row = (array) $row;
+        $row['comment'] = (string) ($commentRow?->comment ?? '');
+
+        return $row;
+    }
+
+    private function fetchBelowSixtyParentName(int $studentId): string
+    {
+        $parentName = 'Parent/Guardian';
+        try {
+            $rows = DB::select(
+                "SELECT u.firstname, u.lastname
+                   FROM family_students fs
+                   JOIN family_guardians fg ON fg.family_id = fs.family_id
+                   JOIN users u ON u.id = fg.user_id
+                  WHERE fs.student_id = ?
+                  ORDER BY fg.is_primary DESC, u.lastname, u.firstname
+                  LIMIT 1",
+                [$studentId]
+            );
+            if (!empty($rows[0])) {
+                $candidate = trim((string) ($rows[0]->firstname ?? '') . ' ' . (string) ($rows[0]->lastname ?? ''));
+                if ($candidate !== '') {
+                    $parentName = $candidate;
+                }
+            }
+        } catch (\Throwable $e) {
+        }
+        return $parentName;
+    }
+
+    private function buildBelowSixtySubject(string $studentName, string $semester, string $schoolYear): string
+    {
+        $subject = 'Student Performance Alert';
+        if ($studentName !== '') {
+            $subject .= ' — ' . $studentName;
+        }
+        if ($semester !== '' || $schoolYear !== '') {
+            $subject .= ' (' . trim($semester . ' ' . $schoolYear) . ')';
+        }
+        return $subject;
+    }
+
+    private function fetchBelowSixtyMeetingContext(int $studentId, string $schoolYear, string $semester): array
+    {
+        $row = $this->fetchBelowSixtyEmailRow($studentId, $schoolYear, $semester);
+        if (empty($row)) {
+            return [];
+        }
+
+        $parentName = 'Parent/Guardian';
+        $parentUserId = null;
+        try {
+            $pRows = DB::select(
+                "SELECT u.id AS user_id, u.firstname, u.lastname
+                   FROM family_students fs
+                   JOIN family_guardians fg ON fg.family_id = fs.family_id
+                   JOIN users u ON u.id = fg.user_id
+                  WHERE fs.student_id = ?
+                  ORDER BY fg.is_primary DESC, u.lastname, u.firstname
+                  LIMIT 1",
+                [$studentId]
+            );
+            if (!empty($pRows[0])) {
+                $parentUserId = (int) ($pRows[0]->user_id ?? 0) ?: null;
+                $parentName = trim((string) ($pRows[0]->firstname ?? '') . ' ' . (string) ($pRows[0]->lastname ?? ''));
+                if ($parentName === '') {
+                    $parentName = 'Parent/Guardian';
+                }
+            }
+        } catch (\Throwable $e) {
+        }
+
+        if ($parentUserId === null) {
+            try {
+                $srow = DB::selectOne(
+                    "SELECT s.parent_id, u.firstname, u.lastname
+                       FROM students s
+                       LEFT JOIN users u ON u.id = s.parent_id
+                      WHERE s.id = ?
+                      LIMIT 1",
+                    [$studentId]
+                );
+                if (!empty($srow)) {
+                    $parentUserId = (int) ($srow->parent_id ?? 0) ?: null;
+                    $fallbackName = trim((string) ($srow->firstname ?? '') . ' ' . (string) ($srow->lastname ?? ''));
+                    if ($fallbackName !== '') {
+                        $parentName = $fallbackName;
+                    }
+                }
+            } catch (\Throwable $e) {
+            }
+        }
+
+        $studentName = trim((string) ($row['firstname'] ?? '') . ' ' . (string) ($row['lastname'] ?? ''));
+
+        return [
+            'student_name' => $studentName !== '' ? $studentName : 'Student',
+            'parent_name' => $parentName,
+            'parent_user_id' => $parentUserId,
+            'class_section_name' => (string) ($row['class_section_name'] ?? ''),
+        ];
+    }
+}
diff --git a/app/Services/Grading/GradingLockService.php b/app/Services/Grading/GradingLockService.php
new file mode 100644
index 00000000..9e5e1bbd
--- /dev/null
+++ b/app/Services/Grading/GradingLockService.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\GradingLock;
+use App\Models\ClassSection;
+use RuntimeException;
+
+class GradingLockService
+{
+    public function toggle(int $classSectionId, string $semester, string $schoolYear, ?int $userId): bool
+    {
+        if ($classSectionId <= 0 || $semester === '' || $schoolYear === '') {
+            throw new RuntimeException('Missing class section or term.');
+        }
+
+        $existing = GradingLock::getLock($classSectionId, $semester, $schoolYear);
+
+        if ($existing && $existing->is_locked) {
+            $existing->update([
+                'is_locked' => 0,
+                'locked_by' => null,
+                'locked_at' => null,
+            ]);
+            return false;
+        }
+
+        if ($existing) {
+            $existing->update([
+                'is_locked' => 1,
+                'locked_by' => $userId ?: null,
+                'locked_at' => now(),
+            ]);
+        } else {
+            GradingLock::query()->create([
+                'class_section_id' => $classSectionId,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'is_locked' => 1,
+                'locked_by' => $userId ?: null,
+                'locked_at' => now(),
+            ]);
+        }
+
+        return true;
+    }
+
+    public function lockAll(string $semester, string $schoolYear, ?int $userId): int
+    {
+        if ($semester === '' || $schoolYear === '') {
+            throw new RuntimeException('Missing semester or school year.');
+        }
+
+        $sectionIds = ClassSection::query()
+            ->select('class_section_id')
+            ->groupBy('class_section_id')
+            ->pluck('class_section_id')
+            ->map(fn ($v) => (int) $v)
+            ->filter(fn ($v) => $v > 0)
+            ->values()
+            ->all();
+
+        if (empty($sectionIds)) {
+            return 0;
+        }
+
+        $existingLocks = GradingLock::query()
+            ->whereIn('class_section_id', $sectionIds)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        $existingBySection = [];
+        foreach ($existingLocks as $row) {
+            $sid = (int) $row->class_section_id;
+            if ($sid > 0) {
+                $existingBySection[$sid] = $row;
+            }
+        }
+
+        $now = now();
+        $insertRows = [];
+        $count = 0;
+
+        foreach ($sectionIds as $sid) {
+            if (!empty($existingBySection[$sid])) {
+                if ($existingBySection[$sid]->is_locked) {
+                    continue;
+                }
+                $existingBySection[$sid]->update([
+                    'is_locked' => 1,
+                    'locked_by' => $userId ?: null,
+                    'locked_at' => $now,
+                ]);
+                $count++;
+                continue;
+            }
+
+            $insertRows[] = [
+                'class_section_id' => $sid,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'is_locked' => 1,
+                'locked_by' => $userId ?: null,
+                'locked_at' => $now,
+                'created_at' => $now,
+                'updated_at' => $now,
+            ];
+            $count++;
+        }
+
+        if (!empty($insertRows)) {
+            GradingLock::query()->insert($insertRows);
+        }
+
+        return $count;
+    }
+}
diff --git a/app/Services/Grading/GradingOverviewService.php b/app/Services/Grading/GradingOverviewService.php
new file mode 100644
index 00000000..1fe2228a
--- /dev/null
+++ b/app/Services/Grading/GradingOverviewService.php
@@ -0,0 +1,439 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\AttendanceRecord;
+use App\Models\CalendarEvent;
+use App\Models\Configuration;
+use App\Models\ClassSection;
+use App\Models\GradingLock;
+use App\Models\Student;
+use App\Services\Scores\AttendanceCalculator;
+use App\Services\Scores\SemesterScoreService;
+use Illuminate\Support\Facades\DB;
+
+class GradingOverviewService
+{
+    private AttendanceCalculator $attendanceCalculator;
+
+    public function __construct(private SemesterScoreService $semesterScoreService)
+    {
+        $this->attendanceCalculator = new AttendanceCalculator(
+            new AttendanceRecord(),
+            new Configuration(),
+            new CalendarEvent()
+        );
+    }
+
+    public function overview(?int $classId, ?string $semester, ?string $schoolYear): array
+    {
+        $schoolYear = $schoolYear ?: (string) (Configuration::getConfig('school_year') ?? '');
+        $configuredSemester = (string) (Configuration::getConfig('semester') ?? '');
+        $semesterOptions = $this->getSemestersForSchoolYear($schoolYear, $configuredSemester);
+        $semester = $this->resolveSemesterSelection($semester, $semesterOptions, $configuredSemester);
+
+        $this->ensureParentReleaseKeyExists('Fall');
+        $this->ensureParentReleaseKeyExists('Spring');
+        $scoresReleased = $this->getParentScoresReleasedForSemester($semester);
+        $scoresReleasedFall = $this->getParentScoresReleasedForSemester('Fall');
+        $scoresReleasedSpring = $this->getParentScoresReleasedForSemester('Spring');
+
+        if ($classId && $this->semesterScoreService) {
+            $sectionIds = ClassSection::query()
+                ->select('class_section_id')
+                ->where('class_id', $classId)
+                ->pluck('class_section_id')
+                ->map(fn ($v) => (int) $v)
+                ->all();
+            foreach ($sectionIds as $sectionId) {
+                $studentTeacherInfo = Student::getStudentInfoByClassSectionId(
+                    $sectionId,
+                    $semester,
+                    $schoolYear
+                );
+                if (empty($studentTeacherInfo)) {
+                    continue;
+                }
+                try {
+                    $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
+                } catch (\Throwable $e) {
+                }
+            }
+        }
+
+        $rows = $this->buildGradingRows($semester, $schoolYear);
+
+        $counts = $this->loadScoreCounts($rows, $semester, $schoolYear);
+
+        $sectionsNeedingRefresh = [];
+        foreach ($rows as $row) {
+            $sectionId = (int) ($row['section_id'] ?? 0);
+            if ($sectionId <= 0) {
+                continue;
+            }
+            if ($row['ss_ptap_score'] === null || $row['ss_semester_score'] === null) {
+                $sectionsNeedingRefresh[$sectionId] = true;
+            }
+        }
+
+        if (!empty($sectionsNeedingRefresh)) {
+            foreach (array_keys($sectionsNeedingRefresh) as $sectionId) {
+                $studentTeacherInfo = Student::getStudentInfoByClassSectionId(
+                    $sectionId,
+                    $semester,
+                    $schoolYear
+                );
+                if (empty($studentTeacherInfo)) {
+                    continue;
+                }
+                try {
+                    $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
+                } catch (\Throwable $e) {
+                }
+            }
+            $rows = $this->buildGradingRows($semester, $schoolYear);
+        }
+
+        $grades = [];
+        $studentsBySection = [];
+        foreach ($rows as $row) {
+            $sectionId = (int) ($row['section_id'] ?? 0);
+            $classIdValue = (int) ($row['class_id'] ?? 0);
+            $sectionName = (string) ($row['class_section_name'] ?? '');
+            if ($sectionId <= 0 || $classIdValue <= 0) {
+                continue;
+            }
+
+            if (!isset($grades[$classIdValue])) {
+                $grades[$classIdValue] = [];
+            }
+            $exists = false;
+            foreach ($grades[$classIdValue] as $section) {
+                if ((int) $section['class_section_id'] === $sectionId) {
+                    $exists = true;
+                    break;
+                }
+            }
+            if (!$exists) {
+                $grades[$classIdValue][] = [
+                    'class_section_id' => $sectionId,
+                    'class_section_name' => $sectionName,
+                ];
+            }
+
+            $studentId = (int) ($row['student_id'] ?? 0);
+            if ($studentId <= 0) {
+                continue;
+            }
+
+            $attendanceScore = $this->calculateAttendanceScoreForStudent(
+                $studentId,
+                $semester,
+                $schoolYear,
+                $sectionId
+            );
+            if ($attendanceScore === null) {
+                $rawAttendance = $row['ss_attendance_score'] ?? null;
+                if ($rawAttendance !== null && $rawAttendance !== '') {
+                    $attendanceScore = round((float) $rawAttendance, 2);
+                }
+            }
+
+            $studentRow = [
+                'id' => $studentId,
+                'school_id' => $row['school_id'] ?? null,
+                'firstname' => $row['firstname'] ?? null,
+                'lastname' => $row['lastname'] ?? null,
+                'class_id' => $classIdValue,
+                'ptap' => $this->normalizeScore($row['ss_ptap_score'] ?? null),
+                'semester_score' => $this->normalizeScore($row['ss_semester_score'] ?? null),
+                'attendance' => $attendanceScore,
+                'homework_avg' => $this->normalizeCountedScore($row['ss_homework_avg'] ?? null, $counts['homework'] ?? [], $sectionId, $studentId),
+                'project_avg' => $this->normalizeCountedScore($row['ss_project_avg'] ?? null, $counts['project'] ?? [], $sectionId, $studentId),
+                'quiz_avg' => $this->normalizeCountedScore($row['ss_quiz_avg'] ?? null, $counts['quiz'] ?? [], $sectionId, $studentId),
+                'participation' => $this->normalizeCountedScore($row['ss_participation_score'] ?? null, $counts['participation'] ?? [], $sectionId, $studentId),
+                'midterm_exam' => $this->normalizeCountedScore($row['ss_midterm_exam_score'] ?? null, $counts['midterm'] ?? [], $sectionId, $studentId),
+                'final_exam' => $this->normalizeScore($row['ss_final_exam_score'] ?? null),
+                'matched_biz_csid' => $row['matched_biz_csid'] ?? null,
+                'matched_pk_csid' => $row['matched_pk_csid'] ?? null,
+                'placement_level' => $row['placement_level'] ?? null,
+            ];
+
+            $studentsBySection[$sectionId][] = $studentRow;
+        }
+
+        $scoreLocks = $this->loadScoreLocks($grades, $semester, $schoolYear);
+
+        return [
+            'grades' => $grades,
+            'students_by_section' => $studentsBySection,
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+            'requested_class_id' => $classId,
+            'semester_options' => $semesterOptions,
+            'scores_released' => $scoresReleased,
+            'scores_released_fall' => $scoresReleasedFall,
+            'scores_released_spring' => $scoresReleasedSpring,
+            'score_locks' => $scoreLocks,
+        ];
+    }
+
+    private function buildGradingRows(string $semester, string $schoolYear): array
+    {
+        $semLower = strtolower(trim($semester));
+
+        return DB::table('student_class as sc')
+            ->select([
+                'cs.id as section_pk',
+                'cs.class_section_id as section_id',
+                'cs.class_id as class_id',
+                'cs.class_section_name',
+                's.id as student_id',
+                's.school_id',
+                's.firstname',
+                's.lastname',
+                'pl.level as placement_level',
+                DB::raw('COALESCE(ss_b.ptap_score, ss_p.ptap_score) as ss_ptap_score'),
+                DB::raw('COALESCE(ss_b.semester_score, ss_p.semester_score) as ss_semester_score'),
+                DB::raw('COALESCE(ss_b.attendance_score, ss_p.attendance_score) as ss_attendance_score'),
+                DB::raw('COALESCE(ss_b.homework_avg, ss_p.homework_avg) as ss_homework_avg'),
+                DB::raw('COALESCE(ss_b.project_avg, ss_p.project_avg) as ss_project_avg'),
+                DB::raw('COALESCE(ss_b.quiz_avg, ss_p.quiz_avg) as ss_quiz_avg'),
+                DB::raw('COALESCE(ss_b.participation_score, ss_p.participation_score) as ss_participation_score'),
+                DB::raw('COALESCE(ss_b.midterm_exam_score, ss_p.midterm_exam_score) as ss_midterm_exam_score'),
+                DB::raw('COALESCE(ss_b.final_exam_score, ss_p.final_exam_score) as ss_final_exam_score'),
+                'ss_b.class_section_id as matched_biz_csid',
+                'ss_p.class_section_id as matched_pk_csid',
+            ])
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->join('students as s', 's.id', '=', 'sc.student_id')
+            ->leftJoin('placement_levels as pl', function ($join) use ($schoolYear) {
+                $join->on('pl.student_id', '=', 's.id')
+                    ->where('pl.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('semester_scores as ss_b', function ($join) use ($semLower, $schoolYear) {
+                $join->on('ss_b.student_id', '=', 's.id')
+                    ->on('ss_b.class_section_id', '=', 'sc.class_section_id')
+                    ->whereRaw('LOWER(TRIM(ss_b.semester)) = ?', [$semLower])
+                    ->where('ss_b.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('semester_scores as ss_p', function ($join) use ($semLower, $schoolYear) {
+                $join->on('ss_p.student_id', '=', 's.id')
+                    ->on('ss_p.class_section_id', '=', 'cs.id')
+                    ->whereRaw('LOWER(TRIM(ss_p.semester)) = ?', [$semLower])
+                    ->where('ss_p.school_year', '=', $schoolYear);
+            })
+            ->where('sc.school_year', $schoolYear)
+            ->where('s.is_active', 1)
+            ->orderBy('cs.class_id', 'ASC')
+            ->orderBy('cs.class_section_name', 'ASC')
+            ->orderBy('s.lastname', 'ASC')
+            ->orderBy('s.firstname', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    private function loadScoreCounts(array $rows, string $semester, string $schoolYear): array
+    {
+        $sectionIds = [];
+        $studentIds = [];
+        foreach ($rows as $row) {
+            $studentId = (int) ($row['student_id'] ?? 0);
+            $sectionId = (int) ($row['section_id'] ?? 0);
+            if ($studentId > 0) {
+                $studentIds[$studentId] = true;
+            }
+            if ($sectionId > 0) {
+                $sectionIds[$sectionId] = true;
+            }
+        }
+
+        $sectionIds = array_keys($sectionIds);
+        $studentIds = array_keys($studentIds);
+        if (empty($sectionIds) || empty($studentIds)) {
+            return [
+                'quiz' => [],
+                'homework' => [],
+                'project' => [],
+                'participation' => [],
+                'midterm' => [],
+            ];
+        }
+
+        return [
+            'quiz' => $this->countScores('quiz', $sectionIds, $studentIds, $semester, $schoolYear),
+            'homework' => $this->countScores('homework', $sectionIds, $studentIds, $semester, $schoolYear),
+            'project' => $this->countScores('project', $sectionIds, $studentIds, $semester, $schoolYear),
+            'participation' => $this->countScores('participation', $sectionIds, $studentIds, $semester, $schoolYear),
+            'midterm' => $this->countScores('midterm_exam', $sectionIds, $studentIds, $semester, $schoolYear),
+        ];
+    }
+
+    private function countScores(string $table, array $sectionIds, array $studentIds, string $semester, string $schoolYear): array
+    {
+        $rows = DB::table($table)
+            ->select('student_id', 'class_section_id', DB::raw('COUNT(*) as cnt'))
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->whereIn('class_section_id', $sectionIds)
+            ->whereIn('student_id', $studentIds)
+            ->whereNotNull('score')
+            ->groupBy('student_id', 'class_section_id')
+            ->get();
+
+        $counts = [];
+        foreach ($rows as $row) {
+            $counts[(int) $row->class_section_id][(int) $row->student_id] = (int) $row->cnt;
+        }
+
+        return $counts;
+    }
+
+    private function loadScoreLocks(array $grades, string $semester, string $schoolYear): array
+    {
+        $sectionIds = [];
+        foreach ($grades as $sections) {
+            foreach ($sections as $section) {
+                $sid = (int) ($section['class_section_id'] ?? 0);
+                if ($sid > 0) {
+                    $sectionIds[$sid] = true;
+                }
+            }
+        }
+        $sectionIds = array_keys($sectionIds);
+        if (empty($sectionIds)) {
+            return [];
+        }
+
+        $locks = GradingLock::query()
+            ->whereIn('class_section_id', $sectionIds)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        $map = [];
+        foreach ($locks as $lock) {
+            $map[(int) $lock->class_section_id] = (bool) $lock->is_locked;
+        }
+
+        return $map;
+    }
+
+    private function calculateAttendanceScoreForStudent(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): ?float
+    {
+        try {
+            $result = $this->attendanceCalculator->calculate($studentId, $semester, $schoolYear, $classSectionId);
+            $score = $result['attendance_score'] ?? null;
+            if ($score === null || $score === '') {
+                return null;
+            }
+            return round((float) $score, 2);
+        } catch (\Throwable $e) {
+        }
+
+        return null;
+    }
+
+    private function normalizeScore($value): ?float
+    {
+        if ($value === null || $value === '') {
+            return null;
+        }
+        return round((float) $value, 2);
+    }
+
+    private function normalizeCountedScore($value, array $countMap, int $sectionId, int $studentId): ?float
+    {
+        $score = $this->normalizeScore($value);
+        if ($score !== null && (float) $score === 0.0) {
+            $count = (int) ($countMap[$sectionId][$studentId] ?? 0);
+            if ($count === 0) {
+                return null;
+            }
+        }
+        return $score;
+    }
+
+    private function resolveSemesterSelection(?string $requestedSemester, array $semesterOptions, ?string $fallbackSemester): string
+    {
+        if ($requestedSemester !== null && $requestedSemester !== '') {
+            foreach ($semesterOptions as $option) {
+                if (strcasecmp($option, $requestedSemester) === 0) {
+                    return $option;
+                }
+            }
+            return $requestedSemester;
+        }
+        if ($fallbackSemester !== null && $fallbackSemester !== '') {
+            foreach ($semesterOptions as $option) {
+                if (strcasecmp($option, $fallbackSemester) === 0) {
+                    return $option;
+                }
+            }
+            return $fallbackSemester;
+        }
+        return $semesterOptions[0] ?? '';
+    }
+
+    private function getSemestersForSchoolYear(string $schoolYear, ?string $fallbackSemester = null): array
+    {
+        $rows = DB::table('semester_scores')
+            ->select(DB::raw('DISTINCT semester'))
+            ->whereNotNull('semester')
+            ->where('semester', '!=', '')
+            ->where('school_year', $schoolYear)
+            ->orderBy('semester', 'ASC')
+            ->get();
+
+        $semesters = [];
+        foreach ($rows as $row) {
+            $value = trim((string) $row->semester);
+            if ($value !== '') {
+                $semesters[] = $value;
+            }
+        }
+
+        if (empty($semesters)) {
+            $semesters = ['Fall', 'Spring'];
+        }
+
+        if ($fallbackSemester !== null && $fallbackSemester !== '' && !in_array($fallbackSemester, $semesters, true)) {
+            array_unshift($semesters, $fallbackSemester);
+        }
+
+        return array_values(array_unique($semesters));
+    }
+
+    private function getParentReleaseKey(string $semester): ?string
+    {
+        $norm = strtolower(trim($semester));
+        if ($norm === 'fall') {
+            return 'parent_scores_released_fall';
+        }
+        if ($norm === 'spring') {
+            return 'parent_scores_released_spring';
+        }
+        return null;
+    }
+
+    private function getParentScoresReleasedForSemester(string $semester): bool
+    {
+        $key = $this->getParentReleaseKey($semester);
+        $raw = $key ? Configuration::getConfig($key) : null;
+        $raw = (string) ($raw ?? '');
+        return in_array(strtolower(trim($raw)), ['1', 'true', 'yes', 'y', 'on'], true);
+    }
+
+    private function ensureParentReleaseKeyExists(string $semester): void
+    {
+        $key = $this->getParentReleaseKey($semester);
+        if (!$key) {
+            return;
+        }
+
+        if (Configuration::getConfigValueByKey($key) === null) {
+            Configuration::setConfigValueByKey($key, '0');
+        }
+    }
+}
diff --git a/app/Services/Grading/GradingPlacementService.php b/app/Services/Grading/GradingPlacementService.php
new file mode 100644
index 00000000..63a36d2f
--- /dev/null
+++ b/app/Services/Grading/GradingPlacementService.php
@@ -0,0 +1,372 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\ClassSection;
+use App\Models\PlacementBatch;
+use App\Models\PlacementLevel;
+use App\Models\PlacementScore;
+use App\Models\Student;
+use Illuminate\Support\Facades\DB;
+use RuntimeException;
+
+class GradingPlacementService
+{
+    public function placementContext(?int $classSectionId, string $schoolYear, ?string $placementTest, ?string $open): array
+    {
+        if (!$classSectionId) {
+            $showStudents = ($placementTest !== '' && $open === '1');
+            $students = $showStudents ? $this->fetchActiveStudentsWithSection($schoolYear) : [];
+            $batches = $this->fetchPlacementBatches($schoolYear);
+            $batchDetails = $this->fetchPlacementBatchDetails($batches, $schoolYear);
+
+            return [
+                'school_year' => $schoolYear,
+                'students' => $students,
+                'batches' => $batches,
+                'batch_details' => $batchDetails,
+                'placement_test' => $placementTest,
+                'show_students' => $showStudents,
+            ];
+        }
+
+        $sectionName = ClassSection::query()->where('class_section_id', $classSectionId)->value('class_section_name');
+        $classId = ClassSection::query()->where('class_section_id', $classSectionId)->value('class_id');
+
+        $students = Student::getStudentInfoByClassSectionId($classSectionId, null, $schoolYear);
+        $studentIds = array_values(array_filter(array_map(
+            static fn ($row) => (int) ($row['student_id'] ?? 0),
+            $students
+        ), static fn ($id) => $id > 0));
+
+        $levels = [];
+        if (!empty($studentIds)) {
+            $rows = PlacementLevel::query()
+                ->whereIn('student_id', $studentIds)
+                ->where('school_year', $schoolYear)
+                ->get();
+            foreach ($rows as $row) {
+                $levels[(int) $row->student_id] = $row->level ?? null;
+            }
+        }
+
+        return [
+            'class_section_id' => $classSectionId,
+            'class_section_name' => $sectionName ?? '',
+            'class_id' => $classId,
+            'school_year' => $schoolYear,
+            'students' => $students,
+            'levels' => $levels,
+        ];
+    }
+
+    public function updatePlacementLevel(int $studentId, string $schoolYear, $level, ?int $userId): void
+    {
+        if ($studentId <= 0 || $schoolYear === '') {
+            throw new RuntimeException('Missing student or school year.');
+        }
+
+        $level = $level === '' || $level === null ? null : (int) $level;
+        if ($level !== null && !in_array($level, [1, 2, 3], true)) {
+            throw new RuntimeException('Invalid placement level.');
+        }
+
+        $existing = PlacementLevel::query()
+            ->where('student_id', $studentId)
+            ->where('school_year', $schoolYear)
+            ->first();
+
+        if ($level === null) {
+            if ($existing) {
+                $existing->delete();
+            }
+            return;
+        }
+
+        $payload = [
+            'student_id' => $studentId,
+            'school_year' => $schoolYear,
+            'level' => $level,
+            'updated_by' => $userId,
+        ];
+
+        if ($existing) {
+            $existing->update($payload);
+        } else {
+            $payload['created_by'] = $userId;
+            PlacementLevel::query()->create($payload);
+        }
+    }
+
+    public function updatePlacementLevels(int $classSectionId, string $schoolYear, array $levels, ?int $userId): void
+    {
+        if ($classSectionId <= 0 || $schoolYear === '') {
+            throw new RuntimeException('Missing class section or school year.');
+        }
+
+        $students = Student::getStudentInfoByClassSectionId($classSectionId, null, $schoolYear);
+        $validIds = array_values(array_filter(array_map(
+            static fn ($row) => (int) ($row['student_id'] ?? 0),
+            $students
+        ), static fn ($id) => $id > 0));
+
+        $validSet = array_flip($validIds);
+        $existingRows = [];
+        if (!empty($validIds)) {
+            $rows = PlacementLevel::query()
+                ->whereIn('student_id', $validIds)
+                ->where('school_year', $schoolYear)
+                ->get();
+            foreach ($rows as $row) {
+                $existingRows[(int) $row->student_id] = $row;
+            }
+        }
+
+        foreach ($levels as $studentIdRaw => $levelRaw) {
+            $studentId = (int) $studentIdRaw;
+            if (!isset($validSet[$studentId])) {
+                continue;
+            }
+            $levelRaw = trim((string) $levelRaw);
+            $level = $levelRaw === '' ? null : (int) $levelRaw;
+            if ($level !== null && !in_array($level, [1, 2, 3], true)) {
+                continue;
+            }
+
+            if ($level === null) {
+                if (isset($existingRows[$studentId])) {
+                    $existingRows[$studentId]->delete();
+                }
+                continue;
+            }
+
+            $payload = [
+                'student_id' => $studentId,
+                'school_year' => $schoolYear,
+                'level' => $level,
+                'updated_by' => $userId,
+            ];
+
+            if (isset($existingRows[$studentId])) {
+                $existingRows[$studentId]->update($payload);
+            } else {
+                $payload['created_by'] = $userId;
+                PlacementLevel::query()->create($payload);
+            }
+        }
+    }
+
+    public function createPlacementBatch(string $schoolYear, string $placementTest, array $levels, ?int $userId): int
+    {
+        if ($schoolYear === '' || $placementTest === '') {
+            throw new RuntimeException('Missing placement test or school year.');
+        }
+
+        $students = $this->fetchActiveStudentsWithSection($schoolYear);
+        $validIds = array_values(array_filter(array_map(
+            static fn ($row) => (int) ($row['student_id'] ?? 0),
+            $students
+        ), static fn ($id) => $id > 0));
+        $validSet = array_flip($validIds);
+
+        $batch = PlacementBatch::query()->create([
+            'placement_test' => $placementTest,
+            'school_year' => $schoolYear,
+            'created_by' => $userId,
+            'updated_by' => $userId,
+        ]);
+
+        $savedCount = 0;
+        foreach ($levels as $studentIdRaw => $levelRaw) {
+            $studentId = (int) $studentIdRaw;
+            if (!isset($validSet[$studentId])) {
+                continue;
+            }
+            $levelRaw = trim((string) $levelRaw);
+            if ($levelRaw === '') {
+                continue;
+            }
+            $score = (int) $levelRaw;
+            if ($score < 0 || $score > 100) {
+                continue;
+            }
+
+            PlacementScore::query()->create([
+                'batch_id' => (int) $batch->id,
+                'student_id' => $studentId,
+                'score' => $score,
+                'created_by' => $userId,
+                'updated_by' => $userId,
+            ]);
+            $savedCount++;
+        }
+
+        if ($savedCount === 0) {
+            $batch->delete();
+            throw new RuntimeException('No scores entered. Batch not saved.');
+        }
+
+        return (int) $batch->id;
+    }
+
+    public function getPlacementBatch(int $batchId): array
+    {
+        $batch = PlacementBatch::query()->find($batchId);
+        if (!$batch) {
+            throw new RuntimeException('Placement batch not found.');
+        }
+
+        $schoolYear = (string) ($batch->school_year ?? '');
+        $students = $this->fetchActiveStudentsWithSection($schoolYear);
+        $scores = $this->fetchPlacementScoresForBatch($batchId);
+
+        return [
+            'batch' => $batch,
+            'students' => $students,
+            'scores' => $scores,
+        ];
+    }
+
+    public function updatePlacementBatch(int $batchId, string $schoolYear, array $levels, ?int $userId): void
+    {
+        $batch = PlacementBatch::query()->find($batchId);
+        if (!$batch) {
+            throw new RuntimeException('Placement batch not found.');
+        }
+
+        $students = $this->fetchActiveStudentsWithSection($schoolYear);
+        $validIds = array_values(array_filter(array_map(
+            static fn ($row) => (int) ($row['student_id'] ?? 0),
+            $students
+        ), static fn ($id) => $id > 0));
+
+        $validSet = array_flip($validIds);
+        $existing = $this->fetchPlacementScoresForBatch($batchId);
+
+        foreach ($levels as $studentIdRaw => $scoreRaw) {
+            $studentId = (int) $studentIdRaw;
+            if (!isset($validSet[$studentId])) {
+                continue;
+            }
+            $scoreRaw = trim((string) $scoreRaw);
+            if ($scoreRaw === '') {
+                if (isset($existing[$studentId])) {
+                    PlacementScore::query()->whereKey($existing[$studentId]['id'])->delete();
+                }
+                continue;
+            }
+            $score = (int) $scoreRaw;
+            if ($score < 0 || $score > 100) {
+                continue;
+            }
+
+            if (isset($existing[$studentId])) {
+                PlacementScore::query()->whereKey($existing[$studentId]['id'])->update([
+                    'score' => $score,
+                    'updated_by' => $userId,
+                ]);
+            } else {
+                PlacementScore::query()->create([
+                    'batch_id' => $batchId,
+                    'student_id' => $studentId,
+                    'score' => $score,
+                    'created_by' => $userId,
+                    'updated_by' => $userId,
+                ]);
+            }
+        }
+
+        $batch->update([
+            'updated_by' => $userId,
+        ]);
+    }
+
+    private function fetchActiveStudentsWithSection(string $schoolYear): array
+    {
+        return DB::table('students as s')
+            ->select('s.id as student_id', 's.school_id', 's.firstname', 's.lastname', 'sc.class_section_id', 'cs.class_section_name', 'c.class_name')
+            ->leftJoin('student_class as sc', function ($join) use ($schoolYear) {
+                $join->on('sc.student_id', '=', 's.id')
+                    ->where('sc.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->leftJoin('classes as c', 'c.id', '=', 'cs.class_id')
+            ->where('s.is_active', 1)
+            ->orderBy('s.lastname', 'ASC')
+            ->orderBy('s.firstname', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    private function fetchPlacementBatches(string $schoolYear): array
+    {
+        return PlacementBatch::query()
+            ->where('school_year', $schoolYear)
+            ->orderBy('created_at', 'DESC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    private function fetchPlacementBatchDetails(array $batches, string $schoolYear): array
+    {
+        if (empty($batches)) {
+            return [];
+        }
+
+        $batchIds = array_values(array_filter(array_map(
+            static fn ($row) => (int) ($row['id'] ?? 0),
+            $batches
+        ), static fn ($id) => $id > 0));
+
+        if (empty($batchIds)) {
+            return [];
+        }
+
+        $rows = DB::table('placement_scores as ps')
+            ->select('ps.batch_id', 'ps.score', 's.school_id', 's.firstname', 's.lastname', 'cs.class_section_name', 'c.class_name')
+            ->join('students as s', 's.id', '=', 'ps.student_id')
+            ->leftJoin('student_class as sc', function ($join) use ($schoolYear) {
+                $join->on('sc.student_id', '=', 's.id')
+                    ->where('sc.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->leftJoin('classes as c', 'c.id', '=', 'cs.class_id')
+            ->whereIn('ps.batch_id', $batchIds)
+            ->where('s.is_active', 1)
+            ->orderBy('ps.batch_id', 'ASC')
+            ->orderBy('s.lastname', 'ASC')
+            ->orderBy('s.firstname', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $details = [];
+        foreach ($rows as $row) {
+            $bid = (int) ($row['batch_id'] ?? 0);
+            if ($bid <= 0) {
+                continue;
+            }
+            $details[$bid][] = $row;
+        }
+
+        return $details;
+    }
+
+    private function fetchPlacementScoresForBatch(int $batchId): array
+    {
+        $rows = PlacementScore::query()
+            ->where('batch_id', $batchId)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $scores = [];
+        foreach ($rows as $row) {
+            $scores[(int) $row['student_id']] = $row;
+        }
+
+        return $scores;
+    }
+}
diff --git a/app/Services/Grading/GradingRefreshService.php b/app/Services/Grading/GradingRefreshService.php
new file mode 100644
index 00000000..d43c3589
--- /dev/null
+++ b/app/Services/Grading/GradingRefreshService.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\ScoreComment;
+use App\Models\SemesterScore;
+use App\Models\Student;
+use App\Services\Scores\SemesterScoreService;
+use RuntimeException;
+
+class GradingRefreshService
+{
+    public function __construct(private SemesterScoreService $semesterScoreService)
+    {
+    }
+
+    public function refreshSemesterScores(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        if ($classSectionId <= 0) {
+            throw new RuntimeException('Missing class section.');
+        }
+
+        $studentTeacherInfo = Student::getStudentInfoByClassSectionId(
+            $classSectionId,
+            $semester,
+            $schoolYear
+        );
+        if (empty($studentTeacherInfo)) {
+            throw new RuntimeException('No students found for this class/term.');
+        }
+
+        $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
+        $this->refreshAttendanceComments($classSectionId, $semester, $schoolYear);
+    }
+
+    private function refreshAttendanceComments(int $classSectionId, string $semester, string $schoolYear): void
+    {
+        if (!function_exists('attendance_comment_from_score')) {
+            return;
+        }
+
+        $scoreRows = SemesterScore::query()
+            ->select(['student_id', 'attendance_score'])
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        if ($scoreRows->isEmpty()) {
+            return;
+        }
+
+        $studentIds = $scoreRows->pluck('student_id')->map(fn ($v) => (int) $v)->unique()->values()->all();
+        if (empty($studentIds)) {
+            return;
+        }
+
+        $students = Student::query()
+            ->select(['id', 'firstname'])
+            ->whereIn('id', $studentIds)
+            ->get();
+        $nameMap = [];
+        foreach ($students as $student) {
+            $nameMap[(int) $student->id] = (string) ($student->firstname ?? '');
+        }
+
+        $existing = ScoreComment::query()
+            ->where('score_type', 'attendance')
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->whereIn('student_id', $studentIds)
+            ->get();
+        $existingByStudent = [];
+        foreach ($existing as $row) {
+            $existingByStudent[(int) $row->student_id] = $row;
+        }
+
+        foreach ($scoreRows as $row) {
+            $studentId = (int) $row->student_id;
+            if ($studentId <= 0) {
+                continue;
+            }
+            $score = $row->attendance_score !== null ? (float) $row->attendance_score : null;
+            if ($score === null) {
+                continue;
+            }
+            $auto = attendance_comment_from_score($score, $nameMap[$studentId] ?? '');
+            if ($auto === null) {
+                continue;
+            }
+
+            if (isset($existingByStudent[$studentId])) {
+                $existingByStudent[$studentId]->update([
+                    'comment' => $auto,
+                ]);
+            } else {
+                ScoreComment::query()->create([
+                    'student_id' => $studentId,
+                    'class_section_id' => $classSectionId,
+                    'score_type' => 'attendance',
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                    'comment' => $auto,
+                    'commented_by' => null,
+                    'created_at' => now(),
+                ]);
+            }
+        }
+    }
+}
diff --git a/app/Services/Grading/GradingScoreService.php b/app/Services/Grading/GradingScoreService.php
new file mode 100644
index 00000000..8fce936e
--- /dev/null
+++ b/app/Services/Grading/GradingScoreService.php
@@ -0,0 +1,189 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\FinalExam;
+use App\Models\GradingLock;
+use App\Models\Homework;
+use App\Models\MidtermExam;
+use App\Models\Project;
+use App\Models\Quiz;
+use App\Models\ScoreComment;
+use App\Models\SemesterScore;
+use App\Models\Student;
+use App\Services\Scores\SemesterScoreService;
+use RuntimeException;
+
+class GradingScoreService
+{
+    public function __construct(private SemesterScoreService $semesterScoreService)
+    {
+    }
+
+    public function show(string $type, int $classSectionId, int $studentId, string $semester, string $schoolYear): array
+    {
+        $model = $this->resolveModel($type);
+        $student = Student::query()->find($studentId);
+
+        if (!$student) {
+            throw new RuntimeException('Student not found.');
+        }
+
+        $scores = $model->newQuery()
+            ->where('student_id', $studentId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        $scoresLocked = $classSectionId > 0
+            ? GradingLock::isLocked($classSectionId, $semester, $schoolYear)
+            : false;
+
+        return [
+            'student' => $student,
+            'scores' => $scores,
+            'type' => $type,
+            'class_section_id' => $classSectionId,
+            'semester' => $semester,
+            'scores_locked' => $scoresLocked,
+        ];
+    }
+
+    public function update(array $payload, int $updatedBy): void
+    {
+        $type = (string) ($payload['type'] ?? '');
+        $studentId = (int) ($payload['student_id'] ?? 0);
+        $classSectionId = (int) ($payload['class_section_id'] ?? 0);
+        $semester = (string) ($payload['semester'] ?? '');
+        $schoolYear = (string) ($payload['school_year'] ?? '');
+
+        if ($classSectionId > 0 && GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new RuntimeException('Scores are locked for this class. Unlock to edit.');
+        }
+
+        $model = $this->resolveModel($type);
+
+        if (in_array($type, ['homework', 'quiz', 'project'], true)) {
+            $scoreIds = $payload['score_ids'] ?? [];
+            $scores = $payload['scores'] ?? [];
+            $comments = $payload['comments'] ?? [];
+
+            foreach ($scoreIds as $i => $id) {
+                $model->newQuery()->whereKey($id)->update([
+                    'score' => $scores[$i] ?? null,
+                    'comment' => $comments[$i] ?? null,
+                    'updated_at' => now(),
+                ]);
+            }
+        } elseif (in_array($type, ['midterm', 'final', 'test'], true)) {
+            $score = $payload['score'] ?? null;
+
+            $data = [
+                'score' => $score,
+                'updated_at' => now(),
+            ];
+
+            $existing = $model->newQuery()
+                ->where('student_id', $studentId)
+                ->where('class_section_id', $classSectionId)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->first();
+
+            if ($existing) {
+                $existing->update($data);
+            } else {
+                $model->newQuery()->create($data + [
+                    'student_id' => $studentId,
+                    'class_section_id' => $classSectionId,
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                    'created_at' => now(),
+                ]);
+            }
+        } elseif ($type === 'comments') {
+            $comment = (string) ($payload['comment'] ?? '');
+
+            $model->newQuery()
+                ->where('student_id', $studentId)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->delete();
+
+            $model->newQuery()->create([
+                'student_id' => $studentId,
+                'score_type' => 'general',
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'comment' => $comment,
+                'commented_by' => $updatedBy ?: null,
+                'created_at' => now(),
+            ]);
+        }
+
+        $studentTeacherInfo = Student::getStudentInfoByClassSectionId($classSectionId, $semester, $schoolYear, $updatedBy);
+        if (!empty($studentTeacherInfo)) {
+            try {
+                $this->semesterScoreService->updateScoresForStudents($studentTeacherInfo, $semester, $schoolYear);
+            } catch (RuntimeException $e) {
+            }
+        }
+    }
+
+    public function getScoreComments(string $semester, string $schoolYear): array
+    {
+        $studentIds = Student::query()
+            ->select('students.id')
+            ->join('student_class', 'student_class.student_id', '=', 'students.id')
+            ->where('student_class.semester', $semester)
+            ->where('student_class.school_year', $schoolYear)
+            ->pluck('students.id')
+            ->map(fn ($v) => (int) $v)
+            ->all();
+
+        if (empty($studentIds)) {
+            return [];
+        }
+
+        $scores = [];
+        $students = Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        foreach ($students as $student) {
+            $scores[$student->id] = [
+                'school_id' => $student->school_id,
+                'firstname' => $student->firstname,
+                'lastname' => $student->lastname,
+                'comments' => [],
+            ];
+        }
+
+        $commentRows = ScoreComment::query()
+            ->whereIn('student_id', $studentIds)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        foreach ($commentRows as $comment) {
+            $scores[$comment->student_id]['comments'][] = $comment;
+        }
+
+        return $scores;
+    }
+
+    private function resolveModel(string $type)
+    {
+        return match ($type) {
+            'homework' => new Homework(),
+            'quiz' => new Quiz(),
+            'project' => new Project(),
+            'midterm' => new MidtermExam(),
+            'final' => new FinalExam(),
+            'test' => new SemesterScore(),
+            'comments' => new ScoreComment(),
+            default => throw new RuntimeException("Invalid type: {$type}"),
+        };
+    }
+}
diff --git a/app/Services/Grading/HomeworkTrackingCalendarService.php b/app/Services/Grading/HomeworkTrackingCalendarService.php
new file mode 100644
index 00000000..bc3568e1
--- /dev/null
+++ b/app/Services/Grading/HomeworkTrackingCalendarService.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\CalendarEvent;
+use DateTime;
+
+class HomeworkTrackingCalendarService
+{
+    public function buildDateRange(string $schoolYear, string $semester): array
+    {
+        $startYear = null;
+        if (preg_match('/\b(20\d{2})\b/', $schoolYear, $m)) {
+            $startYear = (int) $m[1];
+        }
+        if ($startYear === null) {
+            $today = new DateTime('today');
+            return [$today, $today];
+        }
+
+        $nextYear = $startYear + 1;
+        $sem = strtolower(trim($semester));
+
+        try {
+            if ($sem === 'spring') {
+                $start = new DateTime("{$nextYear}-01-25");
+                $end = new DateTime("{$nextYear}-05-31");
+            } else {
+                $start = new DateTime("{$startYear}-09-21");
+                $end = new DateTime("{$nextYear}-01-18");
+            }
+        } catch (\Throwable $e) {
+            $today = new DateTime('today');
+            return [$today, $today];
+        }
+
+        return [$start, $end];
+    }
+
+    public function buildSundays(DateTime $start, DateTime $end): array
+    {
+        if ((int) $start->format('w') !== 0) {
+            $start = (clone $start)->modify('next sunday');
+        }
+
+        $sundays = [];
+        $d = clone $start;
+        while ($d <= $end) {
+            $sundays[] = $d->format('Y-m-d');
+            $d->modify('+7 days');
+        }
+
+        return $sundays;
+    }
+
+    public function eventDays(string $schoolYear): array
+    {
+        $events = CalendarEvent::getEventsBySchoolYear($schoolYear) ?? [];
+        $eventDays = [];
+        foreach ($events as $event) {
+            $ymd = substr((string) ($event['date'] ?? ''), 0, 10);
+            $no = (int) ($event['no_school'] ?? 0);
+            if ($ymd && $no === 1) {
+                $eventDays[$ymd] = true;
+            }
+        }
+
+        return $eventDays;
+    }
+
+    public function dateToIndex(array $sundays, array $eventDays): array
+    {
+        $dateToIndex = [];
+        $idx = 0;
+        foreach ($sundays as $ymd) {
+            if (!isset($eventDays[$ymd])) {
+                $idx++;
+                $dateToIndex[$ymd] = $idx;
+            } else {
+                $dateToIndex[$ymd] = null;
+            }
+        }
+
+        return $dateToIndex;
+    }
+}
diff --git a/app/Services/Grading/HomeworkTrackingService.php b/app/Services/Grading/HomeworkTrackingService.php
new file mode 100644
index 00000000..0c4c6471
--- /dev/null
+++ b/app/Services/Grading/HomeworkTrackingService.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace App\Services\Grading;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+
+class HomeworkTrackingService
+{
+    private array $teacherAssignmentCache = [];
+
+    public function __construct(private HomeworkTrackingCalendarService $calendarService)
+    {
+    }
+
+    public function report(?string $semester = null, ?string $schoolYear = null, int $page = 1): array
+    {
+        $semester = $semester ?: (string) (Configuration::getConfig('semester') ?? '');
+        $schoolYear = $schoolYear ?: (string) (Configuration::getConfig('school_year') ?? '');
+
+        [$start, $end] = $this->calendarService->buildDateRange($schoolYear, $semester);
+        $sundays = $this->calendarService->buildSundays($start, $end);
+        $eventDays = $this->calendarService->eventDays($schoolYear);
+        $dateToIndex = $this->calendarService->dateToIndex($sundays, $eventDays);
+
+        $limitToSemester = $this->hasTeacherAssignments($schoolYear);
+
+        $homeworkByIndex = $this->loadHomeworkByIndex($schoolYear, $semester, $limitToSemester);
+        $homeworkByDate = $this->loadHomeworkByDate($schoolYear, $semester, $limitToSemester, $sundays, $eventDays);
+        $teachers = $this->loadTeachers($schoolYear);
+
+        $perPage = 8;
+        $totalRows = count($teachers);
+        $totalPages = max(1, (int) ceil($totalRows / $perPage));
+        $page = max(1, min($page, $totalPages));
+        $offset = ($page - 1) * $perPage;
+        $teachersPage = array_slice($teachers, $offset, $perPage);
+
+        return [
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+            'sundays' => $sundays,
+            'event_days' => $eventDays,
+            'date_to_index' => $dateToIndex,
+            'teachers' => $teachersPage,
+            'has_homework' => $homeworkByIndex['has_homework'],
+            'hw_entered_at' => $homeworkByIndex['entered_at'],
+            'has_homework_by_date' => $homeworkByDate['has_homework'],
+            'hw_entered_at_by_date' => $homeworkByDate['entered_at'],
+            'page' => $page,
+            'total_pages' => $totalPages,
+            'per_page' => $perPage,
+            'total_rows' => $totalRows,
+        ];
+    }
+
+    private function hasTeacherAssignments(string $schoolYear): bool
+    {
+        $year = trim((string) $schoolYear);
+        if ($year === '') {
+            return false;
+        }
+
+        if (array_key_exists($year, $this->teacherAssignmentCache)) {
+            return $this->teacherAssignmentCache[$year];
+        }
+
+        $cnt = DB::table('teacher_class')->where('school_year', $year)->count();
+        $this->teacherAssignmentCache[$year] = $cnt > 0;
+
+        return $this->teacherAssignmentCache[$year];
+    }
+
+    private function loadHomeworkByIndex(string $schoolYear, string $semester, bool $limitToSemester): array
+    {
+        $query = DB::table('homework')
+            ->select('class_section_id', 'homework_index', DB::raw('MIN(created_at) as first_created'), DB::raw('COUNT(*) as cnt'))
+            ->where('school_year', $schoolYear);
+
+        if ($limitToSemester && $semester !== '') {
+            $query->where('semester', $semester);
+        }
+
+        $rows = $query->groupBy('class_section_id', 'homework_index')->get();
+
+        $hasHomework = [];
+        $enteredAt = [];
+        foreach ($rows as $row) {
+            $csid = (int) $row->class_section_id;
+            $hi = (int) $row->homework_index;
+            $cnt = (int) $row->cnt;
+            if ($csid > 0 && $hi > 0 && $cnt > 0) {
+                $hasHomework[$csid][$hi] = true;
+                $dateStr = substr((string) ($row->first_created ?? ''), 0, 10);
+                $enteredAt[$csid][$hi] = $dateStr ?: null;
+            }
+        }
+
+        return ['has_homework' => $hasHomework, 'entered_at' => $enteredAt];
+    }
+
+    private function loadHomeworkByDate(string $schoolYear, string $semester, bool $limitToSemester, array $sundays, array $eventDays): array
+    {
+        $query = DB::table('homework')
+            ->select(DB::raw('class_section_id, DATE(created_at) as hw_date, MIN(created_at) as first_created, COUNT(*) as cnt'))
+            ->where('school_year', $schoolYear);
+
+        if ($limitToSemester && $semester !== '') {
+            $query->where('semester', $semester);
+        }
+
+        $rows = $query
+            ->groupBy('class_section_id', DB::raw('DATE(created_at)'))
+            ->orderBy('hw_date', 'ASC')
+            ->get();
+
+        $hasHomework = [];
+        $enteredAt = [];
+
+        foreach ($rows as $row) {
+            $csid = (int) $row->class_section_id;
+            $date = substr((string) ($row->hw_date ?? ''), 0, 10);
+            $cnt = (int) $row->cnt;
+            $firstCreated = substr((string) ($row->first_created ?? ''), 0, 10);
+            if ($csid <= 0 || !$date || $cnt <= 0) {
+                continue;
+            }
+
+            $baseIndex = -1;
+            for ($i = count($sundays) - 1; $i >= 0; $i--) {
+                if ($sundays[$i] <= $date) {
+                    $baseIndex = $i;
+                    break;
+                }
+            }
+            if ($baseIndex < 0) {
+                continue;
+            }
+
+            $j = $baseIndex;
+            while ($j >= 0 && !empty($eventDays[$sundays[$j]])) {
+                $j--;
+            }
+            if ($j < 0) {
+                continue;
+            }
+            $sunday = $sundays[$j];
+
+            $hasHomework[$csid][$sunday] = true;
+            $candidate = $firstCreated ?: $date;
+            if (empty($enteredAt[$csid][$sunday]) || ($candidate && $candidate < $enteredAt[$csid][$sunday])) {
+                $enteredAt[$csid][$sunday] = $candidate;
+            }
+        }
+
+        return ['has_homework' => $hasHomework, 'entered_at' => $enteredAt];
+    }
+
+    private function loadTeachers(string $schoolYear): array
+    {
+        $rows = DB::table('teacher_class as tc')
+            ->select('tc.class_section_id', 'tc.position', 'cs.class_section_name', 'cs.class_id', 'u.firstname', 'u.lastname')
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'tc.class_section_id')
+            ->leftJoin('users as u', 'u.id', '=', 'tc.teacher_id')
+            ->where('tc.school_year', $schoolYear)
+            ->whereNotNull('tc.class_section_id')
+            ->whereIn('tc.position', ['main', 'ta'])
+            ->orderBy('cs.class_id', 'ASC')
+            ->orderBy('cs.class_section_name', 'ASC')
+            ->orderByRaw("FIELD(tc.position, 'main','ta')")
+            ->orderBy('u.firstname', 'ASC')
+            ->get();
+
+        $bySection = [];
+        foreach ($rows as $row) {
+            $sid = (int) $row->class_section_id;
+            if ($sid <= 0) {
+                continue;
+            }
+            if (!isset($bySection[$sid])) {
+                $bySection[$sid] = [
+                    'class_section_id' => $sid,
+                    'class_id' => (int) ($row->class_id ?? 0),
+                    'class_section_name' => (string) ($row->class_section_name ?? ''),
+                    'teachers' => [],
+                    'tas' => [],
+                ];
+            }
+            $name = trim((string) ($row->firstname ?? '') . ' ' . (string) ($row->lastname ?? ''));
+            $pos = strtolower((string) ($row->position ?? ''));
+            if ($name !== '') {
+                if ($pos === 'main') {
+                    $bySection[$sid]['teachers'][] = $name;
+                } elseif ($pos === 'ta') {
+                    $bySection[$sid]['tas'][] = $name;
+                }
+            }
+        }
+
+        $teachers = array_values($bySection);
+        usort($teachers, function ($a, $b) {
+            $ai = (int) ($a['class_id'] ?? 0);
+            $bi = (int) ($b['class_id'] ?? 0);
+            $order = function (int $cid): int {
+                if ($cid === 13) return 0;
+                if ($cid >= 1 && $cid <= 11) return $cid;
+                if ($cid === 12) return 99;
+                return 200 + $cid;
+            };
+            $cmp = $order($ai) <=> $order($bi);
+            if ($cmp !== 0) {
+                return $cmp;
+            }
+            return strnatcasecmp($a['class_section_name'] ?? '', $b['class_section_name'] ?? '');
+        });
+
+        return $teachers;
+    }
+}
diff --git a/app/Services/Incidents/CurrentIncidentService.php b/app/Services/Incidents/CurrentIncidentService.php
new file mode 100644
index 00000000..9d1261f6
--- /dev/null
+++ b/app/Services/Incidents/CurrentIncidentService.php
@@ -0,0 +1,233 @@
+<?php
+
+namespace App\Services\Incidents;
+
+use App\Models\Configuration;
+use App\Models\CurrentIncident;
+use App\Models\Incident;
+use App\Models\Student;
+use App\Models\StudentClass;
+use Illuminate\Support\Facades\DB;
+
+class CurrentIncidentService
+{
+    public function __construct(private IncidentLookupService $lookup)
+    {
+    }
+
+    public function listCurrent(): array
+    {
+        $incidents = CurrentIncident::query()->get()->map(fn ($row) => $row->toArray())->all();
+        $schoolYear = Configuration::getConfig('school_year');
+
+        $updaterIds = [];
+        foreach ($incidents as $incident) {
+            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
+                if (!empty($incident[$key])) {
+                    $updaterIds[] = (int) $incident[$key];
+                }
+            }
+        }
+
+        $updaterMap = $this->lookup->updaterNameMap($updaterIds);
+        foreach ($incidents as &$incident) {
+            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
+                $id = (int) ($incident[$key] ?? 0);
+                $incident[$key . '_name'] = $id > 0 ? ($updaterMap[$id] ?? null) : null;
+            }
+        }
+        unset($incident);
+
+        return [
+            'incidents' => $incidents,
+            'grades' => $this->lookup->gradeOptionsWithActiveStudents($schoolYear),
+        ];
+    }
+
+    public function studentsByGrade(int $gradeId): array
+    {
+        $studentIds = StudentClass::query()
+            ->active()
+            ->where('student_class.class_section_id', $gradeId)
+            ->pluck('student_id')
+            ->all();
+
+        if (empty($studentIds)) {
+            return [];
+        }
+
+        return Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('is_active', 1)
+            ->get()
+            ->map(fn ($student) => [
+                'id' => (int) $student->id,
+                'name' => trim((string) $student->firstname . ' ' . (string) $student->lastname),
+            ])
+            ->all();
+    }
+
+    public function addIncident(array $payload, int $userId): array
+    {
+        $studentId = (int) $payload['student_id'];
+        $incidentType = (string) $payload['incident'];
+        $description = (string) ($payload['description'] ?? '');
+        $incidentState = (string) ($payload['incident_state'] ?? 'Open');
+        $stateDescription = (string) ($payload['state_description'] ?? '');
+        $grade = (string) $payload['grade'];
+
+        $student = Student::query()->find($studentId);
+        if (!$student) {
+            return [
+                'ok' => false,
+                'message' => 'Student not found.',
+            ];
+        }
+
+        $semester = Configuration::getConfig('semester');
+        $schoolYear = Configuration::getConfig('school_year');
+        $currentDateTime = function_exists('utc_now') ? utc_now() : now('UTC')->toDateTimeString();
+
+        $existingIncident = CurrentIncident::query()
+            ->where('student_id', $studentId)
+            ->where('incident', $incidentType)
+            ->first();
+
+        if ($existingIncident) {
+            $data = [
+                'incident_datetime' => $currentDateTime,
+                'updated_by_open' => $userId,
+            ];
+
+            if ($incidentState === 'Closed') {
+                $data['incident_state'] = 'Closed';
+                $data['close_description'] = $this->appendLine($existingIncident->close_description ?? '', $stateDescription);
+            } elseif ($incidentState === 'Canceled') {
+                $data['incident_state'] = 'Canceled';
+                $data['cancel_description'] = $this->appendLine($existingIncident->cancel_description ?? '', $stateDescription);
+            } else {
+                $data['open_description'] = $this->appendLine($existingIncident->open_description ?? '', $description);
+            }
+
+            $existingIncident->fill($data);
+            $existingIncident->save();
+
+            return [
+                'ok' => true,
+                'created' => false,
+                'incident_id' => (int) $existingIncident->id,
+            ];
+        }
+
+        $incident = CurrentIncident::query()->create([
+            'student_id' => $student->id,
+            'student_name' => trim((string) $student->firstname . ' ' . (string) $student->lastname),
+            'grade' => $grade,
+            'incident' => $incidentType,
+            'incident_datetime' => $currentDateTime,
+            'incident_state' => 'Open',
+            'updated_by_open' => $userId,
+            'open_description' => $description,
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+        ]);
+
+        return [
+            'ok' => true,
+            'created' => true,
+            'incident_id' => (int) $incident->id,
+        ];
+    }
+
+    public function updateState(int $incidentId, string $newState): bool
+    {
+        return CurrentIncident::query()->whereKey($incidentId)->update([
+            'incident_state' => $newState,
+        ]) > 0;
+    }
+
+    public function closeIncident(int $incidentId, string $closeDescription, ?string $actionTaken, int $userId): array
+    {
+        $incident = CurrentIncident::query()->find($incidentId);
+        if (!$incident) {
+            return ['ok' => false, 'message' => 'Incident not found.'];
+        }
+
+        if ($incident->incident_state === 'Closed') {
+            return ['ok' => false, 'message' => 'Incident is already closed.'];
+        }
+
+        $incident->fill([
+            'incident_state' => 'Closed',
+            'updated_by_closed' => $userId,
+            'close_description' => $closeDescription,
+            'action_taken' => $actionTaken,
+        ]);
+        $incident->save();
+
+        return $this->moveToHistory($incident);
+    }
+
+    public function cancelIncident(int $incidentId, ?string $cancelDescription, ?string $actionTaken, int $userId): array
+    {
+        $incident = CurrentIncident::query()->find($incidentId);
+        if (!$incident) {
+            return ['ok' => false, 'message' => 'Incident not found.'];
+        }
+
+        if ($incident->incident_state === 'Canceled') {
+            return ['ok' => false, 'message' => 'Incident is already canceled.'];
+        }
+
+        $incident->fill([
+            'incident_state' => 'Canceled',
+            'updated_by_canceled' => $userId,
+            'cancel_description' => $cancelDescription,
+            'action_taken' => $actionTaken,
+        ]);
+        $incident->save();
+
+        return $this->moveToHistory($incident);
+    }
+
+    private function moveToHistory(CurrentIncident $incident): array
+    {
+        return DB::transaction(function () use ($incident) {
+            $history = Incident::query()->create([
+                'student_id' => $incident->student_id,
+                'student_name' => $incident->student_name,
+                'grade' => $incident->grade,
+                'incident' => $incident->incident,
+                'incident_datetime' => $incident->incident_datetime,
+                'incident_state' => $incident->incident_state,
+                'updated_by_open' => $incident->updated_by_open,
+                'open_description' => $incident->open_description,
+                'updated_by_closed' => $incident->updated_by_closed,
+                'close_description' => $incident->close_description,
+                'action_taken' => $incident->action_taken,
+                'updated_by_canceled' => $incident->updated_by_canceled,
+                'cancel_description' => $incident->cancel_description,
+                'semester' => $incident->semester,
+                'school_year' => $incident->school_year,
+                'created_at' => $incident->created_at,
+                'updated_at' => $incident->updated_at,
+            ]);
+
+            $incident->delete();
+
+            return [
+                'ok' => true,
+                'incident_id' => (int) $history->id,
+            ];
+        });
+    }
+
+    private function appendLine(string $existing, string $append): string
+    {
+        if ($existing === '') {
+            return $append;
+        }
+
+        return $existing . PHP_EOL . $append;
+    }
+}
diff --git a/app/Services/Incidents/IncidentAnalysisService.php b/app/Services/Incidents/IncidentAnalysisService.php
new file mode 100644
index 00000000..2f4ccc46
--- /dev/null
+++ b/app/Services/Incidents/IncidentAnalysisService.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Services\Incidents;
+
+use App\Models\Incident;
+
+class IncidentAnalysisService
+{
+    public function __construct(private IncidentLookupService $lookup)
+    {
+    }
+
+    public function analyze(?string $schoolYear, ?string $semester): array
+    {
+        $builder = Incident::query()->orderBy('incident_datetime', 'DESC');
+        if ($schoolYear !== null && $schoolYear !== '') {
+            $builder->where('school_year', $schoolYear);
+        }
+        if ($semester !== null && $semester !== '') {
+            $builder->where('semester', $semester);
+        }
+
+        $incidents = $builder->get()->map(fn ($row) => $row->toArray())->all();
+        if (empty($incidents)) {
+            return [];
+        }
+
+        $gradeMap = $this->lookup->gradeNameMap(array_column($incidents, 'grade'));
+        $students = [];
+
+        foreach ($incidents as $incident) {
+            $studentId = (string) ($incident['student_id'] ?? '');
+            $studentName = (string) ($incident['student_name'] ?? '');
+            $studentKey = $studentId !== '' ? 'id:' . $studentId : 'name:' . strtolower(trim($studentName));
+
+            $gradeValue = $incident['grade'] ?? '';
+            $gradeLabel = $gradeValue;
+            if (is_numeric($gradeValue)) {
+                $gradeLabel = $gradeMap[(int) $gradeValue] ?? (string) $gradeValue;
+            }
+
+            if (!isset($students[$studentKey])) {
+                $students[$studentKey] = [
+                    'student_id' => $studentId,
+                    'student_name' => $studentName,
+                    'grade' => (string) $gradeLabel,
+                    'total' => 0,
+                    'open' => 0,
+                    'closed' => 0,
+                    'canceled' => 0,
+                    'last_incident' => null,
+                    'logs' => [],
+                ];
+            }
+
+            $students[$studentKey]['total'] += 1;
+
+            $state = (string) ($incident['incident_state'] ?? '');
+            if ($state === 'Open') {
+                $students[$studentKey]['open'] += 1;
+            } elseif ($state === 'Closed') {
+                $students[$studentKey]['closed'] += 1;
+            } elseif ($state === 'Canceled') {
+                $students[$studentKey]['canceled'] += 1;
+            }
+
+            if ($students[$studentKey]['last_incident'] === null) {
+                $students[$studentKey]['last_incident'] = $incident['incident_datetime'] ?? null;
+            }
+
+            $students[$studentKey]['logs'][] = [
+                'incident' => $incident['incident'] ?? '',
+                'incident_state' => $state,
+                'incident_datetime' => $incident['incident_datetime'] ?? null,
+                'open_description' => $incident['open_description'] ?? null,
+                'close_description' => $incident['close_description'] ?? null,
+                'cancel_description' => $incident['cancel_description'] ?? null,
+                'action_taken' => $incident['action_taken'] ?? null,
+            ];
+        }
+
+        $studentRows = array_values($students);
+        usort($studentRows, function ($a, $b) {
+            if ($a['total'] === $b['total']) {
+                return strcasecmp($a['student_name'], $b['student_name']);
+            }
+            return $b['total'] <=> $a['total'];
+        });
+
+        return $studentRows;
+    }
+}
diff --git a/app/Services/Incidents/IncidentHistoryService.php b/app/Services/Incidents/IncidentHistoryService.php
new file mode 100644
index 00000000..36af2499
--- /dev/null
+++ b/app/Services/Incidents/IncidentHistoryService.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Services\Incidents;
+
+use App\Models\Incident;
+
+class IncidentHistoryService
+{
+    public function __construct(private IncidentLookupService $lookup)
+    {
+    }
+
+    public function history(?string $schoolYear, ?string $semester): array
+    {
+        $builder = Incident::query()->orderBy('incident_datetime', 'DESC');
+        if ($schoolYear !== null && $schoolYear !== '') {
+            $builder->where('school_year', $schoolYear);
+        }
+        if ($semester !== null && $semester !== '') {
+            $builder->where('semester', $semester);
+        }
+
+        return $builder->get()->map(fn ($row) => $row->toArray())->all();
+    }
+
+    public function processed(?string $schoolYear, ?string $semester): array
+    {
+        $incidents = $this->history($schoolYear, $semester);
+        if (empty($incidents)) {
+            return [];
+        }
+
+        $gradeMap = $this->lookup->gradeNameMap(array_column($incidents, 'grade'));
+
+        $updaterIds = [];
+        foreach ($incidents as $incident) {
+            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
+                if (!empty($incident[$key])) {
+                    $updaterIds[] = (int) $incident[$key];
+                }
+            }
+        }
+
+        $updaterMap = $this->lookup->updaterNameMap($updaterIds);
+
+        foreach ($incidents as &$incident) {
+            foreach (['updated_by_open', 'updated_by_closed', 'updated_by_canceled'] as $key) {
+                $id = (int) ($incident[$key] ?? 0);
+                $incident[$key . '_name'] = $id > 0 ? ($updaterMap[$id] ?? null) : null;
+            }
+
+            $gradeValue = $incident['grade'] ?? '';
+            if (is_numeric($gradeValue)) {
+                $incident['grade'] = $gradeMap[(int) $gradeValue] ?? (string) $gradeValue;
+            }
+        }
+        unset($incident);
+
+        return $incidents;
+    }
+}
diff --git a/app/Services/Incidents/IncidentLookupService.php b/app/Services/Incidents/IncidentLookupService.php
new file mode 100644
index 00000000..8031a372
--- /dev/null
+++ b/app/Services/Incidents/IncidentLookupService.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Services\Incidents;
+
+use App\Models\ClassSection;
+use App\Models\StudentClass;
+use Illuminate\Support\Facades\DB;
+
+class IncidentLookupService
+{
+    public function gradeOptionsWithActiveStudents(?string $schoolYear = null): array
+    {
+        $studentCounts = StudentClass::getStudentCountsBySection($schoolYear);
+        if (empty($studentCounts)) {
+            return [];
+        }
+
+        $classSections = ClassSection::query()
+            ->orderBy('class_section_name', 'ASC')
+            ->whereIn('class_section_id', array_keys($studentCounts))
+            ->get()
+            ->map(fn ($row) => $row->toArray())
+            ->all();
+
+        $grades = [];
+        foreach ($classSections as $section) {
+            $grades[] = [
+                'id' => $section['class_section_id'],
+                'name' => $section['class_section_name'],
+            ];
+        }
+
+        return $grades;
+    }
+
+    public function gradeNameMap(array $gradeValues): array
+    {
+        $gradeIds = [];
+        foreach ($gradeValues as $gradeValue) {
+            if (is_numeric($gradeValue)) {
+                $gradeIds[(int) $gradeValue] = true;
+            }
+        }
+
+        if (empty($gradeIds)) {
+            return [];
+        }
+
+        $rows = ClassSection::query()
+            ->select('class_section_id', 'class_section_name')
+            ->whereIn('class_section_id', array_keys($gradeIds))
+            ->get()
+            ->map(fn ($row) => $row->toArray())
+            ->all();
+
+        $gradeMap = [];
+        foreach ($rows as $row) {
+            $gradeMap[(int) $row['class_section_id']] = (string) ($row['class_section_name'] ?? '');
+        }
+
+        return $gradeMap;
+    }
+
+    public function updaterNameMap(array $userIds): array
+    {
+        $userIds = array_values(array_filter(array_unique(array_map('intval', $userIds))));
+        if (empty($userIds)) {
+            return [];
+        }
+
+        $rows = DB::table('users')
+            ->select('id, firstname, lastname')
+            ->whereIn('id', $userIds)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $map = [];
+        foreach ($rows as $row) {
+            $name = trim((string) ($row['firstname'] ?? '') . ' ' . (string) ($row['lastname'] ?? ''));
+            $map[(int) $row['id']] = $name !== '' ? $name : ('User #' . $row['id']);
+        }
+
+        return $map;
+    }
+}
diff --git a/app/Services/Invoices/InvoiceConfigService.php b/app/Services/Invoices/InvoiceConfigService.php
new file mode 100644
index 00000000..1ccb9cc7
--- /dev/null
+++ b/app/Services/Invoices/InvoiceConfigService.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Services\Invoices;
+
+use App\Models\Configuration;
+
+class InvoiceConfigService
+{
+    public function getSchoolYear(): string
+    {
+        return (string) (Configuration::getConfig('school_year') ?? date('Y'));
+    }
+
+    public function getSemester(): string
+    {
+        return (string) (Configuration::getConfig('semester') ?? 'Fall');
+    }
+
+    public function getDueDate(): ?string
+    {
+        $value = Configuration::getConfig('due_date');
+        return $value ? (string) $value : null;
+    }
+
+    public function getGradeFee(): int
+    {
+        return (int) (Configuration::getConfig('grade_fee') ?? 9);
+    }
+
+    public function getFirstStudentFee(): float
+    {
+        return (float) (Configuration::getConfig('first_student_fee') ?? 350);
+    }
+
+    public function getSecondStudentFee(): float
+    {
+        return (float) (Configuration::getConfig('second_student_fee') ?? 200);
+    }
+
+    public function getYouthFee(): float
+    {
+        return (float) (Configuration::getConfig('youth_fee') ?? 180);
+    }
+
+    public function getRefundDeadline(): ?string
+    {
+        $value = Configuration::getConfig('refund_deadline');
+        if (!$value) {
+            return null;
+        }
+
+        try {
+            return date('Y-m-d', strtotime((string) $value));
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+
+    public function getTimezone(): string
+    {
+        return (string) (config('School')->attendance['timezone'] ?? user_timezone());
+    }
+}
diff --git a/app/Services/Invoices/InvoiceGenerationService.php b/app/Services/Invoices/InvoiceGenerationService.php
new file mode 100644
index 00000000..ab3b90b3
--- /dev/null
+++ b/app/Services/Invoices/InvoiceGenerationService.php
@@ -0,0 +1,264 @@
+<?php
+
+namespace App\Services\Invoices;
+
+use App\Models\Enrollment;
+use App\Models\EventCharges;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Refund;
+use App\Models\StudentClass;
+use App\Models\User;
+use DateTime;
+use DateTimeZone;
+use Illuminate\Support\Facades\DB;
+
+class InvoiceGenerationService
+{
+    public function __construct(
+        private InvoiceConfigService $config,
+        private InvoiceTuitionService $tuitionService
+    ) {
+    }
+
+    public function generateInvoice(int $parentId, ?string $schoolYear = null): array
+    {
+        $schoolYear = $schoolYear ?: $this->config->getSchoolYear();
+        $semester = $this->config->getSemester();
+
+        $enrollments = Enrollment::query()
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($r) => (array) $r)
+            ->all();
+
+        if (empty($enrollments)) {
+            return [
+                'ok' => false,
+                'message' => 'No enrollment records found.',
+            ];
+        }
+
+        $registeredKids = [];
+        $withdrawnKids = [];
+
+        foreach ($enrollments as $enrollment) {
+            $student = [
+                'student_id' => $enrollment['student_id'],
+                'parent_id' => $enrollment['parent_id'],
+                'class_section_id' => $enrollment['class_section_id'],
+                'enrollment_status' => $enrollment['enrollment_status'],
+                'school_year' => $enrollment['school_year'],
+                'semester' => $enrollment['semester'],
+                'admission_status' => $enrollment['admission_status'],
+                'is_withdrawn' => $enrollment['is_withdrawn'],
+            ];
+
+            if (in_array($enrollment['enrollment_status'], ['enrolled', 'payment pending'], true)) {
+                $registeredKids[] = $student;
+            } elseif (in_array($enrollment['enrollment_status'], ['withdrawn', 'refund pending', 'withdraw under review'], true)) {
+                $withdrawnKids[] = $student;
+            }
+        }
+
+        $registeredKids = array_values(array_filter($registeredKids, function ($student) use ($schoolYear) {
+            $sid = (int) ($student['student_id'] ?? 0);
+            return $sid > 0 && StudentClass::hasNonEventAssignment($sid, $schoolYear);
+        }));
+
+        $withdrawnKids = array_values(array_filter($withdrawnKids, function ($student) use ($schoolYear) {
+            $sid = (int) ($student['student_id'] ?? 0);
+            return $sid > 0 && StudentClass::hasNonEventAssignment($sid, $schoolYear);
+        }));
+
+        $tuitionFee = $this->tuitionService->calculateTuitionFee(
+            $registeredKids,
+            $withdrawnKids,
+            $this->config->getRefundDeadline()
+        );
+
+        $eventsList = EventCharges::getChargesWithEventInfo($parentId, $schoolYear);
+        $eventChargeTotal = array_sum(array_column($eventsList, 'charged'));
+
+        $this->recalculateAndUpdateDiscount($parentId, $schoolYear, $tuitionFee, $enrollments);
+
+        $refundPaid = (new Refund())->getTotalApprovedRefundByParentIdAndSchoolYear($parentId, $schoolYear);
+        $totalPaid = Payment::getTotalPaidByParentId($parentId, $schoolYear);
+
+        $totalAmount = max(0.0, (float) $tuitionFee) + (float) $eventChargeTotal;
+
+        $existingInvoices = Invoice::getInvoicesByParentId($parentId, $schoolYear);
+        $updated = false;
+        $updatedIds = [];
+        $insertId = null;
+
+        if (!empty($existingInvoices)) {
+            foreach ($existingInvoices as $invoice) {
+                if (!isset($invoice['id'])) {
+                    continue;
+                }
+
+                $extrasSum = $this->sumInvoiceAdditionalCharges((int) $invoice['id'], $schoolYear);
+                $newTotal = round($totalAmount + $extrasSum, 2);
+
+                $invDiscount = $this->sumInvoiceDiscounts((int) $invoice['id']);
+                $invRefunds = $this->sumInvoiceRefunds((int) $invoice['id'], $schoolYear);
+                $paidOnInv = (float) ($invoice['paid_amount'] ?? 0.0);
+
+                $newBalance = $newTotal - $invDiscount - $invRefunds - $paidOnInv;
+                $newStatus = $newBalance <= 0.00001
+                    ? 'Paid'
+                    : ($paidOnInv > 0 ? 'Partially Paid' : 'Unpaid');
+
+                Invoice::query()
+                    ->whereKey($invoice['id'])
+                    ->update([
+                        'total_amount' => $newTotal,
+                        'paid_amount' => $paidOnInv,
+                        'balance' => $newBalance,
+                        'status' => $newStatus,
+                        'updated_at' => utc_now(),
+                    ]);
+
+                $updatedIds[] = (int) $invoice['id'];
+                $updated = true;
+            }
+        } else {
+            $schoolId = User::getSchoolIdByUserId($parentId);
+            $invoiceNumber = $schoolId
+                ? ('INV-' . $schoolId . '-' . uniqid())
+                : uniqid('INV-');
+
+            $issueUtc = (new DateTime('now', new DateTimeZone('UTC')))->format('Y-m-d H:i:s');
+            $dueUtc = null;
+            $dueDate = $this->config->getDueDate();
+            if (!empty($dueDate)) {
+                $dueLocal = new DateTime($dueDate . ' 19:59:59', new DateTimeZone($this->config->getTimezone()));
+                $dueLocal->setTimezone(new DateTimeZone('UTC'));
+                $dueUtc = $dueLocal->format('Y-m-d H:i:s');
+            }
+
+            $insertId = Invoice::query()->insertGetId([
+                'parent_id' => $parentId,
+                'invoice_number' => $invoiceNumber,
+                'total_amount' => $totalAmount,
+                'paid_amount' => 0,
+                'balance' => $totalAmount,
+                'status' => 'Unpaid',
+                'school_year' => $schoolYear,
+                'semester' => $semester,
+                'issue_date' => $issueUtc,
+                'due_date' => $dueUtc,
+                'created_at' => utc_now(),
+                'updated_at' => utc_now(),
+            ]);
+        }
+
+        return [
+            'ok' => true,
+            'updated' => $updated,
+            'updated_ids' => $updatedIds,
+            'insert_id' => $insertId ? (int) $insertId : null,
+            'total_paid' => $totalPaid,
+            'refund_paid' => $refundPaid,
+        ];
+    }
+
+    private function recalculateAndUpdateDiscount(int $parentId, string $schoolYear, float $tuitionFee, array $enrollments): void
+    {
+        $eventChargeTotal = 0.0;
+        try {
+            $eventsList = EventCharges::getChargesWithEventInfo($parentId, $schoolYear);
+            $eventChargeTotal = array_sum(array_column($eventsList, 'charged'));
+        } catch (\Throwable $e) {
+        }
+
+        $invoices = Invoice::getInvoicesByParentId($parentId, $schoolYear);
+        if (empty($invoices)) {
+            return;
+        }
+
+        foreach ($invoices as $invoice) {
+            if (!isset($invoice['id'])) {
+                continue;
+            }
+
+            $invoiceId = (int) $invoice['id'];
+            $discountUsage = DB::table('discount_usages as du')
+                ->select('du.id', 'dv.id as voucher_id', 'dv.discount_type', 'dv.discount_value')
+                ->join('discount_vouchers as dv', 'du.voucher_id', '=', 'dv.id')
+                ->join('invoices as i', 'du.invoice_id', '=', 'i.id')
+                ->where('du.invoice_id', $invoiceId)
+                ->where('i.school_year', $schoolYear)
+                ->first();
+
+            if (!$discountUsage) {
+                continue;
+            }
+
+            $extrasSum = $this->sumInvoiceAdditionalCharges($invoiceId, $schoolYear);
+            $baseTotal = round($tuitionFee + $eventChargeTotal + $extrasSum, 2);
+
+            if (($discountUsage->discount_type ?? '') === 'percent') {
+                $discountAmount = round(($baseTotal * (float) $discountUsage->discount_value) / 100, 2);
+            } else {
+                $discountAmount = min((float) $discountUsage->discount_value, $baseTotal);
+            }
+
+            DB::table('discount_usages')
+                ->where('id', $discountUsage->id)
+                ->update([
+                    'discount_amount' => $discountAmount,
+                    'updated_at' => utc_now(),
+                    'updated_by' => auth()->id(),
+                ]);
+        }
+    }
+
+    private function sumInvoiceAdditionalCharges(int $invoiceId, string $schoolYear): float
+    {
+        $extrasSum = 0.0;
+        $rows = DB::table('additional_charges')
+            ->select('charge_type', 'amount')
+            ->where('invoice_id', $invoiceId)
+            ->where('school_year', $schoolYear)
+            ->where('status', 'applied')
+            ->get();
+
+        foreach ($rows as $row) {
+            $amount = (float) ($row->amount ?? 0);
+            $type = strtolower((string) ($row->charge_type ?? 'add'));
+            if ($type === 'deduct') {
+                $amount = -abs($amount);
+            } else {
+                $amount = abs($amount);
+            }
+            $extrasSum += $amount;
+        }
+
+        return $extrasSum;
+    }
+
+    private function sumInvoiceDiscounts(int $invoiceId): float
+    {
+        $row = DB::table('discount_usages')
+            ->selectRaw('COALESCE(SUM(discount_amount),0) AS tot')
+            ->where('invoice_id', $invoiceId)
+            ->first();
+
+        return (float) ($row->tot ?? 0.0);
+    }
+
+    private function sumInvoiceRefunds(int $invoiceId, string $schoolYear): float
+    {
+        $row = DB::table('refunds')
+            ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS tot')
+            ->where('invoice_id', $invoiceId)
+            ->where('school_year', $schoolYear)
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->first();
+
+        return (float) ($row->tot ?? 0.0);
+    }
+}
diff --git a/app/Services/Invoices/InvoiceGradeService.php b/app/Services/Invoices/InvoiceGradeService.php
new file mode 100644
index 00000000..41d54c1e
--- /dev/null
+++ b/app/Services/Invoices/InvoiceGradeService.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Services\Invoices;
+
+class InvoiceGradeService
+{
+    public function __construct(private int $gradeFee)
+    {
+    }
+
+    public function isKindergarten(string $grade): bool
+    {
+        $g = strtolower(trim($grade));
+        return in_array($g, ['KG', 'kg', 'k', 'kindergarten', 'k-g', 'k.g', 'k g'], true);
+    }
+
+    public function compareGrades(string $gradeA, string $gradeB): int
+    {
+        $valA = $this->getGradeLevel($gradeA);
+        $valB = $this->getGradeLevel($gradeB);
+
+        if ($valA['level'] !== $valB['level']) {
+            return $valA['level'] <=> $valB['level'];
+        }
+
+        return strcmp($valA['suffix'] ?? '', $valB['suffix'] ?? '');
+    }
+
+    public function gradeLevelInt(string $grade): int
+    {
+        $gl = $this->getGradeLevel($grade);
+        return (int) ($gl['level'] ?? 0);
+    }
+
+    public function getGradeLevel($grade): array
+    {
+        if (is_numeric($grade)) {
+            $num = (int) $grade;
+            if ($num === 13) {
+                return ['level' => 1, 'suffix' => '', 'classId' => 13];
+            }
+            return ['level' => $num, 'suffix' => '', 'classId' => null];
+        }
+
+        if (!is_string($grade)) {
+            return ['level' => 999, 'suffix' => '', 'classId' => null];
+        }
+
+        $g = strtoupper(trim($grade));
+        $g = preg_replace('/\s+/', ' ', $g);
+        $g = str_replace(['.', '_'], '', $g);
+        $g = str_replace('-', ' ', $g);
+
+        $kg = ['K', 'KG', 'K G', 'KINDER', 'KINDERGARTEN'];
+        if (in_array($g, $kg, true)) {
+            return ['level' => 1, 'suffix' => '', 'classId' => 13];
+        }
+
+        $pk = ['PK', 'P K', 'PREK', 'PRE K', 'PRE-K', 'PRE KINDER', 'PREKINDER'];
+        if (in_array($g, $pk, true)) {
+            return ['level' => -1, 'suffix' => '', 'classId' => null];
+        }
+
+        if (preg_match('/^Y(?:OUTH)?(?:\s*(\d+))?$/', $g, $m)) {
+            $n = isset($m[1]) && $m[1] !== '' ? max(1, (int) $m[1]) : 1;
+            return [
+                'level' => $this->gradeFee + $n,
+                'suffix' => '',
+                'classId' => null,
+            ];
+        }
+
+        if (preg_match('/^(?:GR?ADE\s*)?(\d{1,2})\s*([A-Z]*)$/', $g, $m)) {
+            return [
+                'level' => (int) $m[1],
+                'suffix' => $m[2] ?? '',
+                'classId' => null,
+            ];
+        }
+
+        return ['level' => 999, 'suffix' => '', 'classId' => null];
+    }
+}
diff --git a/app/Services/Invoices/InvoiceManagementService.php b/app/Services/Invoices/InvoiceManagementService.php
new file mode 100644
index 00000000..c6c05d5f
--- /dev/null
+++ b/app/Services/Invoices/InvoiceManagementService.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Services\Invoices;
+
+use App\Models\Enrollment;
+use App\Models\Invoice;
+use App\Models\Student;
+use App\Models\StudentClass;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class InvoiceManagementService
+{
+    public function __construct(private InvoiceConfigService $config)
+    {
+    }
+
+    public function getManagementData(?string $schoolYear): array
+    {
+        $schoolYear = trim((string) ($schoolYear ?? ''));
+        if ($schoolYear === '') {
+            $schoolYear = $this->config->getSchoolYear();
+        }
+
+        $schoolYears = DB::table('invoices')
+            ->select('school_year')
+            ->distinct()
+            ->orderBy('school_year', 'DESC')
+            ->pluck('school_year')
+            ->map(fn ($val) => (string) $val)
+            ->filter(fn ($val) => $val !== '')
+            ->values()
+            ->all();
+
+        if (empty($schoolYears)) {
+            $schoolYears = [$schoolYear];
+        }
+
+        $invoiceData = [];
+        $parents = User::getUsersByRoleAndSchoolYear('parent', $schoolYear);
+
+        foreach ($parents as $parent) {
+            $students = Student::query()->where('parent_id', $parent['id'])->get()->map(fn ($r) => (array) $r)->all();
+
+            $parentData = [
+                'parent_name' => trim(($parent['firstname'] ?? '') . ' ' . ($parent['lastname'] ?? '')),
+                'parent_id' => (int) $parent['id'],
+                'enrolledKids' => [],
+                'withdrawnKids' => [],
+                'invoice_amount' => 0,
+                'refund_amount' => 0,
+                'last_updated' => null,
+                'invoice_date' => null,
+                'invoice_id' => null,
+            ];
+
+            $invoices = Invoice::getInvoicesByParentId((int) $parent['id'], $schoolYear);
+            foreach ($invoices as $invoice) {
+                if (!$invoice) {
+                    continue;
+                }
+
+                $parentData['invoice_amount'] = (float) ($invoice['total_amount'] ?? 0);
+                $parentData['last_updated'] = $invoice['updated_at'] ?? null;
+                $parentData['invoice_id'] = $invoice['id'] ?? null;
+
+                if (!empty($invoice['issue_date'])) {
+                    $tzName = $this->config->getTimezone();
+                    $parentData['invoice_date'] = (new \DateTimeImmutable($invoice['issue_date'], new \DateTimeZone('UTC')))
+                        ->setTimezone(new \DateTimeZone($tzName))
+                        ->format('Y-m-d H:i:s');
+                } else {
+                    $parentData['invoice_date'] = !empty($invoice['updated_at'])
+                        ? date('Y-m-d H:i:s', strtotime($invoice['updated_at']))
+                        : null;
+                }
+
+                $refund = DB::table('refunds')
+                    ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS refund_paid_amount')
+                    ->where('parent_id', $parent['id'])
+                    ->where('school_year', $schoolYear)
+                    ->whereIn('status', ['Partial', 'Paid'])
+                    ->first();
+
+                $parentData['refund_amount'] = (float) ($refund->refund_paid_amount ?? 0.0);
+                break;
+            }
+
+            foreach ($students as $student) {
+                $grade = 'N/A';
+                $studentClass = DB::table('student_class')
+                    ->where('student_id', $student['id'])
+                    ->where('school_year', $schoolYear)
+                    ->first();
+
+                if ($studentClass && isset($studentClass->class_section_id)) {
+                    $classSection = DB::table('classSection')
+                        ->where('class_section_id', $studentClass->class_section_id)
+                        ->first();
+                    if ($classSection && isset($classSection->class_section_name)) {
+                        $grade = $classSection->class_section_name;
+                    }
+                }
+
+                $enrollments = Enrollment::query()
+                    ->where('student_id', $student['id'])
+                    ->where('school_year', $schoolYear)
+                    ->get()
+                    ->map(fn ($r) => (array) $r)
+                    ->all();
+
+                foreach ($enrollments as $enrollment) {
+                    $kid = [
+                        'name' => trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? '')),
+                        'grade' => $grade,
+                        'tuition_fee' => (float) ($enrollment['tuition_fee'] ?? 0),
+                    ];
+
+                    switch ($enrollment['enrollment_status']) {
+                        case 'payment pending':
+                        case 'enrolled':
+                            $parentData['enrolledKids'][] = $kid;
+                            break;
+                        case 'withdraw under review':
+                        case 'withdrawn':
+                        case 'refund pending':
+                            $parentData['withdrawnKids'][] = $kid;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            if (!empty($parentData['enrolledKids']) || !empty($parentData['withdrawnKids'])) {
+                $invoiceData[] = $parentData;
+            }
+        }
+
+        return [
+            'schoolYear' => $schoolYear,
+            'schoolYears' => $schoolYears,
+            'invoices' => $invoiceData,
+        ];
+    }
+}
diff --git a/app/Services/Invoices/InvoicePaymentService.php b/app/Services/Invoices/InvoicePaymentService.php
new file mode 100644
index 00000000..ec1ad56c
--- /dev/null
+++ b/app/Services/Invoices/InvoicePaymentService.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Services\Invoices;
+
+use App\Models\Invoice;
+use App\Models\Payment;
+use Illuminate\Support\Facades\DB;
+
+class InvoicePaymentService
+{
+    public function __construct(private InvoiceConfigService $config)
+    {
+    }
+
+    public function getParentInvoiceSummary(int $parentId, ?string $schoolYear): array
+    {
+        $currentSchoolYear = $this->config->getSchoolYear();
+
+        $schoolYears = DB::table('invoices')
+            ->select('school_year')
+            ->distinct()
+            ->where('parent_id', $parentId)
+            ->orderBy('school_year', 'DESC')
+            ->get()
+            ->map(fn ($r) => (array) $r)
+            ->all();
+
+        $selectedYear = $schoolYear ?: null;
+        if (!$selectedYear) {
+            $hasCurrentYear = in_array($currentSchoolYear, array_column($schoolYears, 'school_year'), true);
+            $selectedYear = $hasCurrentYear ? $currentSchoolYear : (!empty($schoolYears) ? $schoolYears[0]['school_year'] : null);
+        }
+
+        $invoices = [];
+        if ($selectedYear) {
+            $invoices = Invoice::getInvoicesByParentId($parentId, $selectedYear);
+        }
+
+        $invoiceIds = array_column($invoices, 'id');
+        $refunds = [];
+        if (!empty($invoiceIds)) {
+            $refundResults = DB::table('refunds')
+                ->selectRaw('invoice_id, COALESCE(SUM(refund_paid_amount),0) as refund_paid_amount')
+                ->whereIn('invoice_id', $invoiceIds)
+                ->whereIn('status', ['Partial', 'Paid'])
+                ->groupBy('invoice_id')
+                ->get()
+                ->map(fn ($r) => (array) $r)
+                ->all();
+
+            foreach ($refundResults as $row) {
+                $refunds[$row['invoice_id']] = (float) ($row['refund_paid_amount'] ?? 0);
+            }
+        }
+
+        $lastPayments = [];
+        if (!empty($invoiceIds)) {
+            $paymentResults = Payment::getPaymentsByInvoice($invoiceIds);
+            foreach ($paymentResults as $payment) {
+                $lastPayments[$payment['invoice_id']] = [
+                    'last_paid_amount' => (float) ($payment['last_paid_amount'] ?? 0),
+                    'last_payment_date' => $payment['last_payment_date'] ?? null,
+                ];
+            }
+        }
+
+        foreach ($invoices as &$invoice) {
+            $invoice['refund_amount'] = $refunds[$invoice['id']] ?? 0.0;
+            $invoice['last_paid_amount'] = $lastPayments[$invoice['id']]['last_paid_amount'] ?? 0.0;
+            $invoice['last_payment_date'] = $lastPayments[$invoice['id']]['last_payment_date'] ?? null;
+        }
+        unset($invoice);
+
+        return [
+            'invoices' => $invoices,
+            'schoolYears' => $schoolYears,
+            'selectedYear' => $selectedYear,
+            'currentSchoolYear' => $currentSchoolYear,
+            'dueDate' => $this->config->getDueDate(),
+        ];
+    }
+}
diff --git a/app/Services/Invoices/InvoicePdfService.php b/app/Services/Invoices/InvoicePdfService.php
new file mode 100644
index 00000000..39c006e7
--- /dev/null
+++ b/app/Services/Invoices/InvoicePdfService.php
@@ -0,0 +1,445 @@
+<?php
+
+namespace App\Services\Invoices;
+
+use App\Models\AdditionalCharge;
+use App\Models\ClassSection;
+use App\Models\DiscountUsage;
+use App\Models\Enrollment;
+use App\Models\EventCharges;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Refund;
+use App\Models\Student;
+use App\Models\StudentClass;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class InvoicePdfService
+{
+    public function __construct(
+        private InvoiceConfigService $config,
+        private InvoiceGradeService $grades
+    ) {
+    }
+
+    public function buildPdf(int $invoiceId): string
+    {
+        $data = $this->prepareInvoiceData($invoiceId);
+        if (isset($data['error'])) {
+            return $this->renderErrorPdf($data['error']);
+        }
+
+        return $this->renderPdfInvoice($data);
+    }
+
+    private function prepareInvoiceData(int $invoiceId): array
+    {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            return ['error' => 'No invoice was generated. Please contact the school administration.'];
+        }
+
+        $parentId = (int) ($invoice->parent_id ?? 0);
+        $schoolYear = (string) ($invoice->school_year ?? $this->config->getSchoolYear());
+
+        $paymentsQuery = Payment::query()
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->where('invoice_id', $invoiceId);
+
+        if (Schema::hasColumn('payments', 'status')) {
+            $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+            $paymentsQuery->where(function ($q) use ($exclude) {
+                $q->whereNotIn('status', $exclude)->orWhereNull('status');
+            });
+        }
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $paymentsQuery->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        $payments = $paymentsQuery->get()->map(fn ($r) => $r->toArray())->all();
+
+        $parent = User::query()->find($parentId);
+        if (!$parent) {
+            return ['error' => 'Parent associated with the invoice was not found.'];
+        }
+
+        $enrollments = Enrollment::query()
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($r) => $r->toArray())
+            ->all();
+
+        if (empty($enrollments)) {
+            return ['error' => 'No enrollments found for this invoice.'];
+        }
+
+        $registeredKids = [];
+        $withdrawnKids = [];
+
+        foreach ($enrollments as $enrollment) {
+            $student = Student::query()->find($enrollment['student_id']);
+            if (!$student) {
+                continue;
+            }
+
+            $grade = StudentClass::getStudentGrade((int) $student->id);
+            $studentData = [
+                'student_id' => (int) $student->id,
+                'student_firstname' => (string) ($student->firstname ?? ''),
+                'student_lastname' => (string) ($student->lastname ?? ''),
+                'grade' => $grade,
+                'tuition_fee' => $enrollment['tuition_fee'] ?? 0,
+                'enrollment_status' => $enrollment['enrollment_status'],
+            ];
+
+            if (in_array($enrollment['enrollment_status'], ['enrolled', 'payment pending'], true)) {
+                $registeredKids[] = $studentData;
+            } elseif (in_array($enrollment['enrollment_status'], ['withdrawn', 'withdraw under review', 'refund pending'], true)) {
+                $withdrawnKids[] = $studentData;
+            }
+        }
+
+        $registeredKids = array_values(array_filter($registeredKids, function ($student) use ($schoolYear) {
+            $sid = (int) ($student['student_id'] ?? 0);
+            return $sid > 0 && StudentClass::hasNonEventAssignment($sid, $schoolYear);
+        }));
+
+        $withdrawnKids = array_values(array_filter($withdrawnKids, function ($student) use ($schoolYear) {
+            $sid = (int) ($student['student_id'] ?? 0);
+            return $sid > 0 && StudentClass::hasNonEventAssignment($sid, $schoolYear);
+        }));
+
+        usort($registeredKids, fn ($a, $b) => $this->grades->compareGrades((string) $a['grade'], (string) $b['grade']));
+        usort($withdrawnKids, fn ($a, $b) => $this->grades->compareGrades((string) $a['grade'], (string) $b['grade']));
+
+        $refundAllowed = true;
+        $refundDeadline = $this->config->getRefundDeadline();
+        if ($refundDeadline) {
+            try {
+                $tz = new \DateTimeZone($this->config->getTimezone());
+                $today = new \DateTimeImmutable('today', $tz);
+                $deadline = new \DateTimeImmutable($refundDeadline, $tz);
+                $refundAllowed = $today <= $deadline;
+            } catch (\Throwable $e) {
+                $refundAllowed = true;
+            }
+        }
+
+        $studentCharges = [];
+        $regularCount = 0;
+        $gradeFee = $this->config->getGradeFee();
+        $firstFee = $this->config->getFirstStudentFee();
+        $secondFee = $this->config->getSecondStudentFee();
+        $youthFee = $this->config->getYouthFee();
+
+        $computeCharge = function (int $gradeLevel, string $gradeName) use (&$regularCount, $gradeFee, $firstFee, $secondFee, $youthFee) {
+            $isRegular = $this->grades->isKindergarten($gradeName) || ($gradeLevel > 0 && $gradeLevel <= $gradeFee);
+            if ($isRegular) {
+                $fee = $regularCount === 0 ? $firstFee : $secondFee;
+                $regularCount++;
+                return $fee;
+            }
+            return $youthFee;
+        };
+
+        foreach ($registeredKids as $student) {
+            $gradeName = (string) ($student['grade'] ?? '');
+            $gradeLevel = $this->grades->gradeLevelInt($gradeName);
+            $unitFee = $computeCharge($gradeLevel, $gradeName);
+            $studentCharges[$student['student_id']] = ['unit_fee' => $unitFee, 'refund' => 0];
+        }
+
+        if (!$refundAllowed) {
+            foreach ($withdrawnKids as $student) {
+                $gradeName = (string) ($student['grade'] ?? '');
+                $gradeLevel = $this->grades->gradeLevelInt($gradeName);
+                $unitFee = $computeCharge($gradeLevel, $gradeName);
+                $studentCharges[$student['student_id']] = ['unit_fee' => $unitFee, 'refund' => 0];
+            }
+        }
+
+        $eventsList = EventCharges::getChargesWithEventInfo($parentId, $schoolYear);
+
+        $studentIds = array_values(array_unique(array_map(static fn ($r) => (int) ($r['student_id'] ?? 0), array_merge($registeredKids, $withdrawnKids))));
+        $schoolIdMap = [];
+        if (!empty($studentIds)) {
+            $rows = Student::query()->whereIn('id', $studentIds)->get(['id', 'school_id'])->all();
+            foreach ($rows as $row) {
+                $schoolIdMap[(int) $row->id] = $row->school_id ?? 'N/A';
+            }
+        }
+
+        $students = array_merge($registeredKids, $withdrawnKids);
+        foreach ($students as $i => $s) {
+            $sid = (int) ($s['student_id'] ?? 0);
+            $students[$i]['student_school_id'] = $schoolIdMap[$sid] ?? 'N/A';
+        }
+
+        $discounts = DiscountUsage::query()
+            ->where('invoice_id', $invoiceId)
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($r) => $r->toArray())
+            ->all();
+
+        $refundsPaidTotal = (float) DB::table('refunds')
+            ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS tot')
+            ->where('invoice_id', $invoiceId)
+            ->where('school_year', $schoolYear)
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->value('tot');
+
+        $acRows = AdditionalCharge::query()
+            ->select('id', 'charge_type', 'title', 'description', 'amount', 'due_date', 'status', 'created_at')
+            ->where('invoice_id', $invoiceId)
+            ->where('status', '!=', 'void')
+            ->orderBy('created_at')
+            ->orderBy('id')
+            ->get()
+            ->map(fn ($r) => $r->toArray())
+            ->all();
+
+        $additionalChargeLines = [];
+        $additionalChargesTotal = 0.0;
+        foreach ($acRows as $ac) {
+            $signed = (float) ($ac['amount'] ?? 0);
+            $ctype = strtolower((string) ($ac['charge_type'] ?? ''));
+            if ($ctype === 'deduct' && $signed > 0) {
+                $signed = -$signed;
+            } elseif ($ctype === 'add' && $signed < 0) {
+                $signed = abs($signed);
+            }
+
+            $lineDate = !empty($ac['created_at'])
+                ? date('Y-m-d', strtotime($ac['created_at']))
+                : (!empty($invoice->created_at) ? local_date($invoice->created_at, 'Y-m-d') : local_date(utc_now(), 'Y-m-d'));
+
+            $desc = $ac['description'] ?? '';
+            if ($desc === '') {
+                $desc = $ctype === 'deduct' ? 'Deduct' : 'Add';
+            }
+
+            $additionalChargesTotal += $signed;
+            $additionalChargeLines[] = [
+                'date' => $lineDate,
+                'description' => $desc,
+                'amount' => $signed,
+            ];
+        }
+
+        return [
+            'invoice' => $invoice->toArray(),
+            'parent' => $parent->toArray(),
+            'registeredKids' => $registeredKids,
+            'withdrawnKids' => $withdrawnKids,
+            'studentCharges' => $studentCharges,
+            'events' => $eventsList,
+            'students' => $students,
+            'payments' => $payments,
+            'discounts' => $discounts,
+            'additionalChargeLines' => $additionalChargeLines,
+            'additionalChargesTotal' => round($additionalChargesTotal, 2),
+            'refundsPaidTotal' => $refundsPaidTotal,
+        ];
+    }
+
+    private function renderPdfInvoice(array $data): string
+    {
+        $invoice = $data['invoice'];
+        $parent = $data['parent'];
+        $registeredKids = $data['registeredKids'] ?? [];
+        $withdrawnKids = $data['withdrawnKids'] ?? [];
+        $studentCharges = $data['studentCharges'] ?? [];
+        $events = $data['events'] ?? [];
+        $students = $data['students'] ?? [];
+        $payments = $data['payments'] ?? [];
+        $discounts = $data['discounts'] ?? [];
+        $additionalChargeLines = $data['additionalChargeLines'] ?? [];
+        $additionalChargesTotal = (float) ($data['additionalChargesTotal'] ?? 0);
+        $refundsPaidTotal = (float) ($data['refundsPaidTotal'] ?? 0);
+
+        $pdf = new \FPDF();
+        $pdf->AddPage();
+        $pdf->SetFont('Arial', 'B', 16);
+        $pdf->Cell(0, 10, 'Invoice', 0, 1, 'C');
+        $pdf->Ln(4);
+
+        $pdf->SetFont('Arial', 'B', 12);
+        $pdf->Cell(40, 6, 'Parent Name:', 0, 0, 'L');
+        $pdf->SetFont('Arial', '', 12);
+        $pdf->Cell(0, 6, ($parent['firstname'] ?? '') . ' ' . ($parent['lastname'] ?? ''), 0, 1, 'L');
+
+        $pdf->SetFont('Arial', 'B', 12);
+        $pdf->Cell(40, 6, 'Invoice Number:', 0, 0, 'L');
+        $pdf->SetFont('Arial', '', 12);
+        $pdf->Cell(0, 6, (string) ($invoice['invoice_number'] ?? ''), 0, 1, 'L');
+
+        $pdf->Ln(8);
+        $pdf->SetFont('Arial', 'B', 11);
+        $pdf->Cell(30, 7, 'Date', 1);
+        $pdf->Cell(130, 7, 'Description', 1);
+        $pdf->Cell(30, 7, 'Amount', 1, 1, 'R');
+
+        $transactions = [];
+        $seq = 0;
+        $push = function (\DateTimeImmutable $dt, string $desc, float $amount, string $cat) use (&$transactions, &$seq) {
+            $transactions[] = [
+                'dt' => $dt,
+                'description' => $desc,
+                'amount' => $amount,
+                'cat' => $cat,
+                'seq' => $seq++,
+            ];
+        };
+
+        $tz = new \DateTimeZone($this->config->getTimezone());
+        $toLocal = function (?string $raw) use ($tz): \DateTimeImmutable {
+            if (!$raw) {
+                return new \DateTimeImmutable('now', $tz);
+            }
+            try {
+                return new \DateTimeImmutable($raw, $tz);
+            } catch (\Throwable $e) {
+                return new \DateTimeImmutable('now', $tz);
+            }
+        };
+
+        foreach ($registeredKids as $student) {
+            $id = $student['student_id'];
+            $unit = (float) ($studentCharges[$id]['unit_fee'] ?? 0.0);
+            $name = $student['student_firstname'] . ' ' . $student['student_lastname'];
+            $gradeName = ClassSection::getClassSectionNameByClassId($student['grade']) ?? $student['grade'];
+            $push($toLocal($invoice['created_at'] ?? null), 'Registration of "' . $name . '" in ' . $gradeName, $unit, 'registration');
+        }
+
+        foreach ($events as $event) {
+            $studentName = 'N/A';
+            if (!empty($event['student_id'])) {
+                foreach ($students as $st) {
+                    if (($st['student_id'] ?? null) == $event['student_id']) {
+                        $studentName = $st['student_firstname'] . ' ' . $st['student_lastname'];
+                        break;
+                    }
+                }
+            }
+            $amount = (float) ($event['charged'] ?? 0.0);
+            $eventName = $event['event_name'] ?? 'Event';
+            $push($toLocal($event['created_at'] ?? null), 'Event ' . $eventName . ' for "' . $studentName . '"', $amount, 'event');
+        }
+
+        foreach ($additionalChargeLines as $line) {
+            $push($toLocal($line['date'] ?? null), (string) ($line['description'] ?? 'Additional Charge'), (float) ($line['amount'] ?? 0), 'additional');
+        }
+
+        $totalPaid = 0.0;
+        foreach ($payments as $payment) {
+            $amount = (float) ($payment['paid_amount'] ?? 0.0);
+            $totalPaid += $amount;
+            $push($toLocal($payment['payment_date'] ?? null), 'Payment (' . ($payment['payment_method'] ?? 'Payment') . ')', -$amount, 'payment');
+        }
+
+        $totalDiscount = 0.0;
+        foreach ($discounts as $discount) {
+            $amount = (float) ($discount['discount_amount'] ?? 0.0);
+            $totalDiscount += $amount;
+            $push($toLocal($discount['used_at'] ?? null), 'Discount applied', -$amount, 'discount');
+        }
+
+        usort($transactions, function ($a, $b) {
+            $dayA = $a['dt']->format('Y-m-d');
+            $dayB = $b['dt']->format('Y-m-d');
+            if ($dayA !== $dayB) {
+                return $a['dt'] <=> $b['dt'];
+            }
+            $pri = [
+                'registration' => 10,
+                'event' => 20,
+                'additional' => 25,
+                'discount' => 30,
+                'payment' => 90,
+                'other' => 50,
+            ];
+            $pa = $pri[$a['cat']] ?? 50;
+            $pb = $pri[$b['cat']] ?? 50;
+            if ($pa !== $pb) {
+                return $pa <=> $pb;
+            }
+            $cmp = $a['dt'] <=> $b['dt'];
+            return $cmp !== 0 ? $cmp : ($a['seq'] <=> $b['seq']);
+        });
+
+        $pdf->SetFont('Arial', '', 10);
+        foreach ($transactions as $t) {
+            $pdf->Cell(30, 7, $t['dt']->format('m-d-Y'), 1);
+            $pdf->Cell(130, 7, $t['description'], 1);
+            $pdf->Cell(30, 7, ($t['amount'] < 0 ? '-$' : '$') . number_format(abs($t['amount']), 2), 1, 1, 'R');
+        }
+
+        $tuitionSubtotal = 0.0;
+        foreach ($studentCharges as $sc) {
+            $tuitionSubtotal += (float) ($sc['unit_fee'] ?? 0.0);
+        }
+        $eventSubtotal = 0.0;
+        foreach ($events as $ev) {
+            $eventSubtotal += (float) ($ev['charged'] ?? 0.0);
+        }
+
+        $totalAmount = round($tuitionSubtotal + $eventSubtotal + $additionalChargesTotal, 2);
+        $balance = $totalAmount - $totalPaid - $totalDiscount - $refundsPaidTotal;
+        if ($balance < 0) {
+            $balance = 0.0;
+        }
+
+        $pdf->Ln(5);
+        $pdf->SetFont('Arial', 'B', 12);
+        $pdf->Cell(160, 7, 'Total Charges:', 0, 0, 'R');
+        $pdf->SetFont('Arial', '', 12);
+        $pdf->Cell(30, 7, '$' . number_format($totalAmount, 2), 0, 1, 'R');
+
+        $pdf->SetFont('Arial', 'B', 12);
+        $pdf->Cell(160, 7, 'Total Paid:', 0, 0, 'R');
+        $pdf->SetFont('Arial', '', 12);
+        $pdf->Cell(30, 7, '$' . number_format($totalPaid, 2), 0, 1, 'R');
+
+        if ($totalDiscount > 0) {
+            $pdf->SetFont('Arial', 'B', 12);
+            $pdf->Cell(160, 7, 'Total Discount:', 0, 0, 'R');
+            $pdf->SetFont('Arial', '', 12);
+            $pdf->Cell(30, 7, '$' . number_format($totalDiscount, 2), 0, 1, 'R');
+        }
+
+        if ($refundsPaidTotal > 0) {
+            $pdf->SetFont('Arial', 'B', 12);
+            $pdf->Cell(160, 7, 'Refunds Paid:', 0, 0, 'R');
+            $pdf->SetFont('Arial', '', 12);
+            $pdf->Cell(30, 7, '$' . number_format($refundsPaidTotal, 2), 0, 1, 'R');
+        }
+
+        $pdf->SetFont('Arial', 'B', 12);
+        $pdf->Cell(160, 7, 'Balance Due:', 0, 0, 'R');
+        $pdf->SetFont('Arial', '', 12);
+        $pdf->Cell(30, 7, '$' . number_format($balance, 2), 0, 1, 'R');
+
+        return $pdf->Output('S');
+    }
+
+    private function renderErrorPdf(string $message): string
+    {
+        $pdf = new \FPDF();
+        $pdf->AddPage();
+        $pdf->SetFont('Arial', 'B', 16);
+        $pdf->Cell(0, 10, 'Error', 0, 1, 'C');
+        $pdf->SetFont('Arial', '', 12);
+        $pdf->Ln(10);
+        $pdf->MultiCell(0, 10, $message);
+
+        return $pdf->Output('S');
+    }
+}
diff --git a/app/Services/Invoices/InvoiceTuitionService.php b/app/Services/Invoices/InvoiceTuitionService.php
new file mode 100644
index 00000000..967c579e
--- /dev/null
+++ b/app/Services/Invoices/InvoiceTuitionService.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Services\Invoices;
+
+use App\Models\ClassSection;
+
+class InvoiceTuitionService
+{
+    public function __construct(
+        private InvoiceGradeService $grades,
+        private int $gradeFee,
+        private float $firstStudentFee,
+        private float $secondStudentFee,
+        private float $youthFee,
+        private string $timezone
+    ) {
+    }
+
+    public function calculateTuitionFee(array $registeredKids, array $withdrawnKids, ?string $refundDeadline): float
+    {
+        $refundOk = $this->isRefundAllowed($refundDeadline);
+        $tuitionStudents = $refundOk ? $registeredKids : array_merge($registeredKids, $withdrawnKids);
+
+        return $this->calculateTotalTuitionFee($tuitionStudents);
+    }
+
+    public function calculateTotalTuitionFee(array $students): float
+    {
+        foreach ($students as &$student) {
+            $gradeName = ClassSection::getClassSectionNameBySectionId($student['class_section_id'] ?? null) ?? '';
+            $student['grade'] = strtoupper(trim($gradeName));
+        }
+        unset($student);
+
+        $regularCount = 0;
+        $youthCount = 0;
+
+        foreach ($students as $student) {
+            $levelInfo = $this->grades->getGradeLevel($student['grade'] ?? '');
+            $level = (int) ($levelInfo['level'] ?? 999);
+
+            if ($level > $this->gradeFee) {
+                $youthCount++;
+            } else {
+                $regularCount++;
+            }
+        }
+
+        $total = 0.0;
+        $total += $youthCount * $this->youthFee;
+
+        if ($regularCount >= 2) {
+            $total += $this->firstStudentFee;
+            $total += ($regularCount - 1) * $this->secondStudentFee;
+        } elseif ($regularCount === 1) {
+            $total += $this->firstStudentFee;
+        }
+
+        return $total;
+    }
+
+    private function isRefundAllowed(?string $refundDeadline): bool
+    {
+        if (!$refundDeadline) {
+            return true;
+        }
+
+        try {
+            $tz = new \DateTimeZone($this->timezone);
+            $today = new \DateTimeImmutable('today', $tz);
+            $deadline = new \DateTimeImmutable($refundDeadline, $tz);
+            return $today <= $deadline;
+        } catch (\Throwable $e) {
+            return true;
+        }
+    }
+}
diff --git a/app/Services/Payments/PaymentBalanceService.php b/app/Services/Payments/PaymentBalanceService.php
new file mode 100644
index 00000000..2dfcfc50
--- /dev/null
+++ b/app/Services/Payments/PaymentBalanceService.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Payment;
+
+class PaymentBalanceService
+{
+    public function updateBalance(int $paymentId, float $amountPaid): bool
+    {
+        return Payment::updateBalance($paymentId, $amountPaid);
+    }
+}
diff --git a/app/Services/Payments/PaymentEnrollmentEventService.php b/app/Services/Payments/PaymentEnrollmentEventService.php
new file mode 100644
index 00000000..fd2728ba
--- /dev/null
+++ b/app/Services/Payments/PaymentEnrollmentEventService.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Configuration;
+use Illuminate\Support\Facades\DB;
+
+class PaymentEnrollmentEventService
+{
+    public function buildEventData(
+        int $parentId,
+        array $studentIds,
+        ?string $schoolYear = null,
+        ?string $semester = null,
+        ?string $portalLink = null
+    ): array {
+        $schoolYear = $schoolYear ?: Configuration::getConfig('school_year');
+        $semester = $semester ?: Configuration::getConfig('semester');
+        $portalLink = $portalLink ?: url('/login');
+
+        $parent = DB::table('users')
+            ->select('id', 'firstname', 'lastname', 'email')
+            ->where('id', $parentId)
+            ->first();
+
+        if (!$parent) {
+            throw new \RuntimeException("Parent user #{$parentId} not found");
+        }
+
+        $ids = array_values(array_unique(array_map('intval', $studentIds)));
+        if (empty($ids)) {
+            $ids = DB::table('students')
+                ->where('parent_id', $parentId)
+                ->pluck('id')
+                ->map(fn ($id) => (int) $id)
+                ->all();
+        }
+
+        if (empty($ids)) {
+            $data = [
+                'user_id' => (int) $parent->id,
+                'email' => $parent->email ?? null,
+                'firstname' => $parent->firstname ?? '',
+                'lastname' => $parent->lastname ?? '',
+                'school_year' => $schoolYear,
+                'semester' => $semester,
+                'portal_link' => $portalLink,
+            ];
+
+            return [$data, []];
+        }
+
+        $rows = DB::table('students as s')
+            ->select([
+                's.id as student_id',
+                's.firstname as s_firstname',
+                's.lastname as s_lastname',
+                's.registration_grade',
+                'sc.class_section_id',
+                'cs.class_section_name',
+                'tu.firstname as t_firstname',
+                'tu.lastname as t_lastname',
+            ])
+            ->leftJoin('student_class as sc', function ($join) use ($schoolYear) {
+                $join->on('sc.student_id', '=', 's.id')
+                    ->where('sc.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->leftJoin('teacher_class as tc', function ($join) use ($schoolYear) {
+                $join->on('tc.class_section_id', '=', 'sc.class_section_id')
+                    ->where('tc.position', '=', 'main')
+                    ->where('tc.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('users as tu', 'tu.id', '=', 'tc.teacher_id')
+            ->where('s.parent_id', $parentId)
+            ->whereIn('s.id', $ids)
+            ->orderByDesc('sc.updated_at')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        if (empty($rows)) {
+            $rows = DB::table('students as s')
+                ->select('s.id as student_id', 's.firstname as s_firstname', 's.lastname as s_lastname', 's.registration_grade')
+                ->where('s.parent_id', $parentId)
+                ->whereIn('s.id', $ids)
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+        }
+
+        $students = [];
+        $seen = [];
+        foreach ($rows as $row) {
+            $sid = (int) ($row['student_id'] ?? 0);
+            if ($sid <= 0 || isset($seen[$sid])) {
+                continue;
+            }
+            $seen[$sid] = true;
+
+            $teacherFull = trim(trim((string) ($row['t_firstname'] ?? '')) . ' ' . trim((string) ($row['t_lastname'] ?? '')));
+            $teacherFull = $teacherFull !== '' ? $teacherFull : null;
+
+            $students[] = [
+                'id' => $sid,
+                'student_id' => $sid,
+                'firstname' => (string) ($row['s_firstname'] ?? ''),
+                'lastname' => (string) ($row['s_lastname'] ?? ''),
+                'name' => trim(((string) ($row['s_firstname'] ?? '')) . ' ' . ((string) ($row['s_lastname'] ?? ''))),
+                'registration_grade' => (string) ($row['registration_grade'] ?? ''),
+                'class_section_id' => isset($row['class_section_id']) ? (int) $row['class_section_id'] : null,
+                'class_section_name' => $row['class_section_name'] ?? null,
+                'teacher_name' => $teacherFull,
+                'start_date' => '',
+                'portal_link' => $portalLink,
+            ];
+        }
+
+        $data = [
+            'user_id' => (int) $parent->id,
+            'email' => $parent->email ?? null,
+            'firstname' => $parent->firstname ?? '',
+            'lastname' => $parent->lastname ?? '',
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+            'portal_link' => $portalLink,
+        ];
+
+        return [$data, $students];
+    }
+}
diff --git a/app/Services/Payments/PaymentEventChargesService.php b/app/Services/Payments/PaymentEventChargesService.php
new file mode 100644
index 00000000..5c0ccecf
--- /dev/null
+++ b/app/Services/Payments/PaymentEventChargesService.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Configuration;
+use App\Models\Enrollment;
+use App\Models\StudentClass;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class PaymentEventChargesService
+{
+    public function listCharges(?string $schoolYear, ?string $semester): array
+    {
+        $schoolYear = $schoolYear ?: Configuration::getConfig('school_year');
+        $semester = $semester ?: Configuration::getConfig('semester');
+
+        $charges = DB::table('event_charges')
+            ->select(
+                'event_charges.*',
+                'users.firstname AS parent_firstname',
+                'users.lastname AS parent_lastname',
+                'students.firstname AS student_firstname',
+                'students.lastname AS student_lastname'
+            )
+            ->leftJoin('users', 'users.id', '=', 'event_charges.parent_id')
+            ->leftJoin('students', 'students.id', '=', 'event_charges.student_id')
+            ->where('event_charges.school_year', $schoolYear)
+            ->where('event_charges.semester', $semester)
+            ->orderByDesc('event_charges.created_at')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        return [
+            'charges' => $charges,
+            'parents' => User::getParents(),
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+        ];
+    }
+
+    public function addCharges(array $payload, int $userId): int
+    {
+        $studentIds = $payload['student_ids'] ?? [];
+        $parentId = (int) $payload['parent_id'];
+
+        $commonData = [
+            'parent_id' => $parentId,
+            'event_name' => $payload['event_name'],
+            'description' => $payload['description'] ?? null,
+            'amount' => (float) $payload['amount'],
+            'semester' => $payload['semester'],
+            'school_year' => $payload['school_year'],
+            'charged' => 0,
+            'updated_by' => $userId,
+            'created_at' => now(),
+            'updated_at' => now(),
+        ];
+
+        $count = 0;
+
+        if (!empty($studentIds)) {
+            foreach ($studentIds as $studentId) {
+                DB::table('event_charges')->insert(array_merge($commonData, [
+                    'student_id' => (int) $studentId,
+                ]));
+                $count++;
+            }
+        } elseif (!empty($payload['student_id'])) {
+            DB::table('event_charges')->insert(array_merge($commonData, [
+                'student_id' => (int) $payload['student_id'],
+            ]));
+            $count++;
+        }
+
+        return $count;
+    }
+
+    public function getEnrolledStudents(int $parentId, ?string $schoolYear): array
+    {
+        $schoolYear = $schoolYear ?: Configuration::getConfig('school_year');
+
+        $enrollments = Enrollment::getEnrolledStudents($parentId, $schoolYear);
+
+        $students = [];
+        foreach ($enrollments as $row) {
+            $students[] = [
+                'id' => (int) ($row->id ?? 0),
+                'firstname' => (string) ($row->firstname ?? ''),
+                'lastname' => (string) ($row->lastname ?? ''),
+                'grade' => StudentClass::getStudentGrade((int) ($row->id ?? 0)) ?: 'N/A',
+            ];
+        }
+
+        return $students;
+    }
+}
diff --git a/app/Services/Payments/PaymentLookupService.php b/app/Services/Payments/PaymentLookupService.php
new file mode 100644
index 00000000..c8afc495
--- /dev/null
+++ b/app/Services/Payments/PaymentLookupService.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Payment;
+
+class PaymentLookupService
+{
+    public function getByParent(int $parentId, ?string $schoolYear = null): array
+    {
+        $query = Payment::query()->where('parent_id', $parentId);
+
+        if ($schoolYear) {
+            $query->where('school_year', $schoolYear);
+        }
+
+        return $query->orderByDesc('payment_date')->get()->toArray();
+    }
+}
diff --git a/app/Services/Payments/PaymentManualService.php b/app/Services/Payments/PaymentManualService.php
new file mode 100644
index 00000000..d56936af
--- /dev/null
+++ b/app/Services/Payments/PaymentManualService.php
@@ -0,0 +1,649 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Configuration;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\Student;
+use App\Services\Discounts\DiscountInvoiceService;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Schema;
+
+class PaymentManualService
+{
+    public function __construct(
+        private DiscountInvoiceService $invoiceService,
+        private PaymentEnrollmentEventService $enrollmentEventService
+    ) {
+    }
+
+    public function search(string $searchTerm, ?string $schoolYear = null): array
+    {
+        $searchTerm = trim($searchTerm);
+        $schoolYear = $schoolYear ?: Configuration::getConfig('school_year');
+        $installmentDateRaw = (string) (Configuration::getConfig('installment_date') ?? '');
+
+        $installmentEndYmd = '';
+        if ($installmentDateRaw !== '') {
+            $ts = strtotime($installmentDateRaw);
+            if ($ts !== false) {
+                $installmentEndYmd = date('Y-m-d', $ts);
+            }
+        }
+
+        $parentData = null;
+        $students = [];
+        $payments = [];
+        $invoices = [];
+        $pagination = null;
+
+        if ($searchTerm !== '') {
+            $searchClean = preg_replace('/\D/', '', $searchTerm);
+            $searchFormatted = $this->formatPhone($searchClean);
+
+            $builder = DB::table('users')->select('*');
+            $builder->where(function ($q) use ($searchTerm, $searchClean, $searchFormatted) {
+                $q->where('email', $searchTerm);
+
+                if (!empty($searchClean)) {
+                    if (strlen($searchClean) === 10) {
+                        $formattedPhone = substr($searchClean, 0, 3) . '-' . substr($searchClean, 3, 3) . '-' . substr($searchClean, 6, 4);
+                        $q->orWhere('cellphone', $formattedPhone);
+                    }
+
+                    $q->orWhereRaw(
+                        "REPLACE(REPLACE(REPLACE(REPLACE(cellphone, '(', ''), ')', ''), '-', ''), ' ', '') = ?",
+                        [$searchClean]
+                    );
+                }
+
+                if (!empty($searchFormatted)) {
+                    $q->orWhere('cellphone', $searchFormatted);
+                }
+            });
+
+            $parent = (array) $builder->first();
+            if (!empty($parent)) {
+                unset($parent['password']);
+                $parentData = $parent;
+                $parentId = (int) ($parent['id'] ?? 0);
+
+                if ($parentId > 0) {
+                    $students = Student::query()->where('parent_id', $parentId)->get()->toArray();
+
+                    $paymentPaginator = Payment::query()
+                        ->where('parent_id', $parentId)
+                        ->orderByDesc('payment_date')
+                        ->paginate(10);
+
+                    $payments = $paymentPaginator->items();
+                    $pagination = [
+                        'current_page' => $paymentPaginator->currentPage(),
+                        'per_page' => $paymentPaginator->perPage(),
+                        'total' => $paymentPaginator->total(),
+                        'last_page' => $paymentPaginator->lastPage(),
+                    ];
+
+                    $rawInvoices = Invoice::query()
+                        ->where('parent_id', $parentId)
+                        ->when($schoolYear, fn ($q) => $q->where('school_year', $schoolYear))
+                        ->orderByDesc('issue_date')
+                        ->get()
+                        ->toArray();
+
+                    $invoices = $this->normalizeInvoices($rawInvoices, $installmentEndYmd);
+                }
+            }
+        }
+
+        return [
+            'parent' => $parentData,
+            'students' => $students,
+            'payments' => $payments,
+            'invoices' => $invoices,
+            'pagination' => $pagination,
+            'search_term' => $searchTerm,
+            'today' => function_exists('utc_now') ? utc_now() : now()->toDateTimeString(),
+            'installment_end_ymd' => $installmentEndYmd,
+        ];
+    }
+
+    public function suggest(string $query): array
+    {
+        $q = trim($query);
+        if ($q === '') {
+            return [];
+        }
+
+        $digits = preg_replace('/\D/', '', $q);
+
+        $sql = "SELECT id, firstname, lastname, email, cellphone
+                FROM users
+                WHERE (
+                    CONCAT_WS(' ', firstname, lastname) LIKE ?
+                    OR email LIKE ?
+                    OR cellphone LIKE ?";
+
+        $params = ['%' . $q . '%', '%' . $q . '%', '%' . $q . '%'];
+
+        if ($digits !== '') {
+            $sql .= " OR REPLACE(REPLACE(REPLACE(REPLACE(cellphone, '(', ''), ')', ''), '-', ''), ' ', '') LIKE ?";
+            $params[] = '%' . $digits . '%';
+        }
+
+        $sql .= ") ORDER BY lastname, firstname LIMIT 20";
+
+        $rows = DB::select($sql, $params);
+
+        $items = [];
+        foreach ($rows as $row) {
+            $label = trim(($row->firstname ?? '') . ' ' . ($row->lastname ?? ''));
+            $email = trim((string) ($row->email ?? ''));
+            $phone = trim((string) ($row->cellphone ?? ''));
+            $sub = trim($email . ' ' . $phone);
+            $value = $email !== '' ? $email : ($phone !== '' ? $phone : $label);
+
+            $items[] = [
+                'id' => (int) ($row->id ?? 0),
+                'label' => $label,
+                'sub' => $sub,
+                'value' => $value,
+            ];
+        }
+
+        return $items;
+    }
+
+    public function recordPayment(
+        int $invoiceId,
+        float $amount,
+        string $paymentMethod,
+        ?string $paymentDate,
+        ?string $checkNumber,
+        ?string $paymentType,
+        ?UploadedFile $paymentFile,
+        ?string $schoolYear = null,
+        ?string $semester = null,
+        ?int $userId = null
+    ): array {
+        $paymentMethod = strtolower(trim($paymentMethod));
+        $allowedMethods = ['cash', 'check', 'card'];
+
+        if (!in_array($paymentMethod, $allowedMethods, true)) {
+            throw new \InvalidArgumentException('Invalid payment method.');
+        }
+
+        if ($paymentMethod === 'check' && ($checkNumber === null || $checkNumber === '')) {
+            throw new \InvalidArgumentException('Check number is required for check payments.');
+        }
+
+        if ($amount <= 0) {
+            throw new \InvalidArgumentException('Invalid amount.');
+        }
+
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            throw new \RuntimeException('Invoice not found.');
+        }
+
+        $schoolYear = $schoolYear ?: (string) ($invoice->school_year ?? Configuration::getConfig('school_year'));
+        $semester = $semester ?: (string) ($invoice->semester ?? Configuration::getConfig('semester'));
+
+        $initialPreBalance = $this->getCurrentInvoiceBalance($invoiceId, $schoolYear);
+
+        if ($paymentMethod === 'card' && round($amount, 2) !== round($initialPreBalance, 2)) {
+            throw new \InvalidArgumentException('Card payments must equal the full remaining balance.');
+        }
+
+        $checkFile = null;
+        if ($paymentFile) {
+            $checkFile = $this->storePaymentFile($paymentFile, $paymentMethod);
+        }
+
+        $paymentDate = $paymentDate ? date('Y-m-d H:i:s', strtotime($paymentDate)) : (function_exists('utc_now') ? utc_now() : now()->toDateTimeString());
+
+        DB::beginTransaction();
+
+        try {
+            $locked = DB::table('invoices')->where('id', $invoiceId)->lockForUpdate()->first();
+            if (!$locked) {
+                DB::rollBack();
+                throw new \RuntimeException('Invoice not found.');
+            }
+
+            $this->invoiceService->recalculateInvoice($invoiceId, $schoolYear);
+            $currentBalance = $this->getCurrentInvoiceBalance($invoiceId, $schoolYear);
+
+            if ($amount > $currentBalance + 0.00001) {
+                DB::rollBack();
+                throw new \InvalidArgumentException('Entered amount exceeds remaining balance.');
+            }
+
+            if ($paymentMethod === 'card' && round($amount, 2) !== round($currentBalance, 2)) {
+                DB::rollBack();
+                throw new \InvalidArgumentException('Card payments must equal the full remaining balance.');
+            }
+
+            $paidCount = $this->getSuccessfulPaymentCount($invoiceId);
+            $installmentSeq = $paidCount + 1;
+
+            $transactionId = 'INV-' . $invoiceId . '-' . str_replace('.', '', (string) microtime(true));
+
+            $ok = $this->processPayment(
+                $invoiceId,
+                $amount,
+                $paymentMethod,
+                $checkFile,
+                $transactionId,
+                $paymentDate,
+                $schoolYear,
+                $semester,
+                $checkNumber,
+                $installmentSeq,
+                $userId
+            );
+
+            if (!$ok) {
+                DB::rollBack();
+                throw new \RuntimeException('Failed to record payment.');
+            }
+
+            $this->invoiceService->recalculateInvoice($invoiceId, $schoolYear);
+
+            $postBalance = max(0.0, round($initialPreBalance - $amount, 2));
+
+            $enrollmentUpdated = $this->invoiceService->updateEnrollmentStatusIfPaid($invoiceId, $schoolYear);
+            if ($enrollmentUpdated > 0) {
+                $studentIds = Student::query()->where('parent_id', $invoice->parent_id)->pluck('id')->all();
+                [$eventDataEnroll, $studentDataEnroll] = $this->enrollmentEventService->buildEventData(
+                    (int) $invoice->parent_id,
+                    $studentIds,
+                    $schoolYear,
+                    $semester
+                );
+
+                $this->triggerEvent('studentEnrolled', [$eventDataEnroll, $studentDataEnroll]);
+            }
+
+            $invoiceDiscount = (float) (DB::table('discount_usages')
+                ->selectRaw('COALESCE(SUM(discount_amount),0) AS sum_disc')
+                ->where('invoice_id', $invoiceId)
+                ->value('sum_disc') ?? 0);
+
+            $parentYearDiscountTotal = (float) (DB::table('discount_usages')
+                ->selectRaw('COALESCE(SUM(discount_amount),0) AS sum_disc')
+                ->where('parent_id', $invoice->parent_id)
+                ->where('school_year', $schoolYear)
+                ->value('sum_disc') ?? 0);
+
+            DB::commit();
+
+            [$eventData, $studentData] = $this->invoiceService->buildPaymentEventData(
+                $invoiceId,
+                $transactionId,
+                $amount,
+                $paymentMethod,
+                $paymentDate,
+                $checkNumber,
+                $installmentSeq,
+                $initialPreBalance,
+                $postBalance,
+                $schoolYear,
+                $semester
+            );
+
+            $eventData['invoice_discount'] = $invoiceDiscount;
+            $eventData['parent_year_discount_total'] = $parentYearDiscountTotal;
+
+            $this->triggerEvent('paymentReceived', [$eventData, $studentData]);
+
+            return [
+                'transaction_id' => $transactionId,
+                'installment_seq' => $installmentSeq,
+                'pre_balance' => $initialPreBalance,
+                'post_balance' => $postBalance,
+            ];
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            Log::error('[manualPayUpdate] ' . $e->getMessage());
+            throw $e;
+        }
+    }
+
+    public function editPayment(
+        int $paymentId,
+        float $paidAmount,
+        string $paymentMethod,
+        ?string $checkNumber,
+        ?UploadedFile $paymentFile,
+        ?int $userId = null
+    ): void {
+        $paymentMethod = strtolower(trim($paymentMethod));
+
+        if ($paidAmount <= 0) {
+            throw new \InvalidArgumentException('Invalid amount entered.');
+        }
+
+        $payment = Payment::query()->find($paymentId);
+        if (!$payment) {
+            throw new \RuntimeException('Original payment not found.');
+        }
+
+        $invoice = Invoice::query()->find((int) $payment->invoice_id);
+        if (!$invoice) {
+            throw new \RuntimeException('Linked invoice not found.');
+        }
+
+        $checkFile = $payment->check_file;
+        if ($paymentFile) {
+            $checkFile = $this->storePaymentFile($paymentFile, $paymentMethod);
+        }
+
+        $this->invoiceService->recalculateInvoice((int) $payment->invoice_id, (string) ($invoice->school_year ?? Configuration::getConfig('school_year')));
+
+        $currentBalance = $this->getCurrentInvoiceBalanceExcludingPayment((int) $payment->invoice_id, $paymentId);
+
+        if ($paidAmount > $currentBalance) {
+            throw new \InvalidArgumentException('Entered amount exceeds remaining balance.');
+        }
+
+        $updateData = [
+            'paid_amount' => $paidAmount,
+            'payment_method' => $paymentMethod,
+            'check_file' => $checkFile,
+            'updated_by' => $userId,
+            'check_number' => $paymentMethod === 'check' ? $checkNumber : null,
+        ];
+
+        Payment::query()->whereKey($paymentId)->update($updateData);
+
+        $this->invoiceService->recalculateInvoice((int) $payment->invoice_id, (string) ($invoice->school_year ?? Configuration::getConfig('school_year')));
+    }
+
+    public function serveCheckFile(string $filename, string $mode = 'download')
+    {
+        $filename = basename($filename);
+        $roots = [
+            storage_path('app/uploads/checks/' . $filename),
+            storage_path('app/uploads/cards/' . $filename),
+            storage_path('app/uploads/misc/' . $filename),
+            storage_path('app/uploads/' . $filename),
+        ];
+
+        $path = null;
+        foreach ($roots as $candidate) {
+            if (is_file($candidate)) {
+                $path = $candidate;
+                break;
+            }
+        }
+
+        if (!$path) {
+            abort(404, 'Payment file not found.');
+        }
+
+        if ($mode === 'inline') {
+            return response()->file($path, [
+                'Content-Type' => mime_content_type($path) ?: 'application/octet-stream',
+                'Content-Disposition' => 'inline; filename="' . $filename . '"',
+            ]);
+        }
+
+        return response()->download($path, $filename);
+    }
+
+    private function processPayment(
+        int $invoiceId,
+        float $amount,
+        string $paymentMethod,
+        ?string $checkFile,
+        string $transactionId,
+        string $paymentDate,
+        ?string $schoolYear,
+        ?string $semester,
+        ?string $checkNumber,
+        int $installmentSeq,
+        ?int $userId
+    ): bool {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            return false;
+        }
+
+        $newPaid = (float) $invoice->paid_amount + $amount;
+        $newBalance = (float) $invoice->balance - $amount;
+
+        if ($newBalance == $invoice->total_amount) {
+            $paymentStatus = 'Unpaid';
+        } elseif ($newBalance > 0 && $newBalance < $invoice->total_amount) {
+            $paymentStatus = 'Partially Paid';
+        } elseif ($newBalance <= 0.00001) {
+            $paymentStatus = 'Paid';
+        } else {
+            $paymentStatus = $invoice->status;
+        }
+
+        $invoiceUpdateData = [
+            'paid_amount' => $newPaid,
+            'balance' => $newBalance,
+            'status' => $paymentStatus,
+            'updated_by' => $userId,
+        ];
+
+        if (!Invoice::query()->whereKey($invoiceId)->update($invoiceUpdateData)) {
+            return false;
+        }
+
+        $paymentData = [
+            'parent_id' => $invoice->parent_id,
+            'invoice_id' => $invoiceId,
+            'total_amount' => $invoice->total_amount,
+            'paid_amount' => $amount,
+            'balance' => $newBalance,
+            'number_of_installments' => $installmentSeq,
+            'transaction_id' => $transactionId,
+            'payment_method' => strtolower($paymentMethod),
+            'payment_date' => $paymentDate,
+            'status' => $paymentStatus,
+            'check_file' => $checkFile,
+            'check_number' => strtolower($paymentMethod) === 'check' ? $checkNumber : null,
+            'updated_by' => $userId,
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+        ];
+
+        return (bool) Payment::query()->create($paymentData);
+    }
+
+    private function getCurrentInvoiceBalance(int $invoiceId, string $schoolYear): float
+    {
+        return $this->invoiceService->getCurrentInvoiceBalance($invoiceId, $schoolYear);
+    }
+
+    private function getCurrentInvoiceBalanceExcludingPayment(int $invoiceId, int $excludePaymentId): float
+    {
+        $invoice = Invoice::query()->find($invoiceId);
+        if (!$invoice) {
+            return 0.0;
+        }
+
+        $paymentQuery = Payment::query()
+            ->selectRaw('COALESCE(SUM(paid_amount),0) AS total_paid')
+            ->where('invoice_id', $invoiceId)
+            ->where('id', '!=', $excludePaymentId);
+
+        if (Schema::hasColumn('payments', 'status')) {
+            $paymentQuery->where(function ($q) {
+                $q->whereNotIn('status', [
+                    'void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled',
+                ])->orWhereNull('status');
+            });
+        }
+
+        if (Schema::hasColumn('payments', 'is_void')) {
+            $paymentQuery->where(function ($q) {
+                $q->where('is_void', 0)->orWhereNull('is_void');
+            });
+        }
+
+        $row = (array) $paymentQuery->first();
+        $totalPaid = (float) ($row['total_paid'] ?? 0);
+
+        $totalDisc = (float) (DB::table('discount_usages')
+            ->selectRaw('COALESCE(SUM(discount_amount),0) AS total_disc')
+            ->where('invoice_id', $invoiceId)
+            ->value('total_disc') ?? 0);
+
+        $totalRefundPaid = (float) (DB::table('refunds')
+            ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
+            ->where('invoice_id', $invoiceId)
+            ->whereIn('status', ['Partial', 'Paid'])
+            ->value('total_refund_paid') ?? 0);
+
+        $total = (float) ($invoice->total_amount ?? 0);
+
+        return max(0.0, round($total - $totalPaid - $totalDisc - $totalRefundPaid, 2));
+    }
+
+    private function getSuccessfulPaymentCount(int $invoiceId): int
+    {
+        $exclude = ['void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled'];
+
+        return Payment::query()
+            ->where('invoice_id', $invoiceId)
+            ->where('paid_amount', '>', 0)
+            ->whereNotIn('status', $exclude)
+            ->count();
+    }
+
+    private function normalizeInvoices(array $rawInvoices, string $installmentEndYmd): array
+    {
+        if (empty($rawInvoices)) {
+            return [];
+        }
+
+        $invoiceIds = array_values(array_unique(array_map(static fn ($r) => (int) ($r['id'] ?? 0), $rawInvoices)));
+        $paidByInvoice = [];
+        $discountByInvoice = [];
+        $refundByInvoice = [];
+
+        if (!empty($invoiceIds)) {
+            $rows = Payment::query()
+                ->selectRaw('invoice_id, COALESCE(SUM(paid_amount),0) AS total_paid')
+                ->whereIn('invoice_id', $invoiceIds)
+                ->groupBy('invoice_id')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($rows as $row) {
+                $paidByInvoice[(int) ($row['invoice_id'] ?? 0)] = (float) ($row['total_paid'] ?? 0);
+            }
+
+            $discRows = DB::table('discount_usages')
+                ->selectRaw('invoice_id, COALESCE(SUM(discount_amount),0) AS total_disc')
+                ->whereIn('invoice_id', $invoiceIds)
+                ->groupBy('invoice_id')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($discRows as $row) {
+                $discountByInvoice[(int) ($row['invoice_id'] ?? 0)] = (float) ($row['total_disc'] ?? 0);
+            }
+
+            $refundRows = DB::table('refunds')
+                ->selectRaw('invoice_id, COALESCE(SUM(refund_paid_amount),0) AS total_refund_paid')
+                ->whereIn('invoice_id', $invoiceIds)
+                ->whereIn('status', ['Partial', 'Paid'])
+                ->groupBy('invoice_id')
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            foreach ($refundRows as $row) {
+                $refundByInvoice[(int) ($row['invoice_id'] ?? 0)] = (float) ($row['total_refund_paid'] ?? 0);
+            }
+        }
+
+        return array_map(function (array $inv) use ($installmentEndYmd, $paidByInvoice, $discountByInvoice, $refundByInvoice) {
+            $inv['total_amount'] = isset($inv['total_amount']) ? (float) $inv['total_amount'] : 0.0;
+            $iid = (int) ($inv['id'] ?? 0);
+            $actualPaid = $paidByInvoice[$iid] ?? null;
+            $inv['paid_amount'] = is_numeric($actualPaid) ? (float) $actualPaid : (float) ($inv['paid_amount'] ?? 0);
+            $inv['discount'] = isset($discountByInvoice[$iid]) ? (float) $discountByInvoice[$iid] : (float) ($inv['discount'] ?? 0.0);
+            $inv['refund_paid'] = isset($refundByInvoice[$iid]) ? (float) $refundByInvoice[$iid] : 0.0;
+            $inv['balance'] = max(0.0, (float) $inv['total_amount'] - (float) $inv['paid_amount'] - (float) $inv['discount'] - (float) $inv['refund_paid']);
+            $inv['due_ymd'] = $installmentEndYmd;
+
+            $issueYmd = '';
+            foreach (['issue_date', 'start_date', 'created_at'] as $k) {
+                if (!empty($inv[$k])) {
+                    $its = strtotime((string) $inv[$k]);
+                    if ($its !== false) {
+                        $issueYmd = date('Y-m-d', $its);
+                        break;
+                    }
+                }
+            }
+            $inv['issue_ymd'] = $issueYmd;
+
+            return $inv;
+        }, $rawInvoices);
+    }
+
+    private function formatPhone(string $input): string
+    {
+        $digits = preg_replace('/\D/', '', $input);
+        if (strlen($digits) !== 10) {
+            return $input;
+        }
+
+        return sprintf('(%s)-%s-%s', substr($digits, 0, 3), substr($digits, 3, 3), substr($digits, 6, 4));
+    }
+
+    private function storePaymentFile(UploadedFile $file, string $paymentMethod): string
+    {
+        $mime = $file->getMimeType();
+        $ext = strtolower($file->getClientOriginalExtension() ?: '');
+
+        $okTypes = ['image/jpeg', 'image/png', 'application/pdf'];
+        $okExts = ['jpg', 'jpeg', 'png', 'pdf'];
+
+        if (!in_array($mime, $okTypes, true) || !in_array($ext, $okExts, true)) {
+            throw new \InvalidArgumentException('Unsupported file type. Use JPG, PNG, or PDF.');
+        }
+
+        if ($file->getSize() > 5 * 1024 * 1024) {
+            throw new \InvalidArgumentException('File too large. Max 5MB.');
+        }
+
+        $fileName = $file->hashName();
+        $subdir = $paymentMethod === 'check' ? 'checks' : ($paymentMethod === 'card' ? 'cards' : 'misc');
+        $targetDir = storage_path('app/uploads/' . $subdir);
+
+        if (!is_dir($targetDir)) {
+            mkdir($targetDir, 0775, true);
+        }
+
+        $file->move($targetDir, $fileName);
+
+        return $fileName;
+    }
+
+    private function triggerEvent(string $name, array $payload): void
+    {
+        try {
+            if (class_exists(\CodeIgniter\Events\Events::class)) {
+                \CodeIgniter\Events\Events::trigger($name, ...$payload);
+            } elseif (function_exists('event')) {
+                event($name, $payload);
+            }
+        } catch (\Throwable $e) {
+            Log::warning($name . ' hook failed: ' . $e->getMessage());
+        }
+    }
+}
diff --git a/app/Services/Payments/PaymentNotificationDispatchService.php b/app/Services/Payments/PaymentNotificationDispatchService.php
new file mode 100644
index 00000000..a18d1a05
--- /dev/null
+++ b/app/Services/Payments/PaymentNotificationDispatchService.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Notification;
+use App\Models\UserNotification;
+use App\Models\Configuration;
+
+class PaymentNotificationDispatchService
+{
+    public function notifyUser(int $userId, string $title, string $message, array $channels = ['in_app']): void
+    {
+        $schoolYear = Configuration::getConfig('school_year');
+        $semester = Configuration::getConfig('semester');
+
+        $notification = Notification::query()->create([
+            'title' => $title,
+            'message' => $message,
+            'target_group' => 'user',
+            'delivery_channels' => $channels,
+            'priority' => 'normal',
+            'status' => 'sent',
+            'scheduled_at' => now(),
+            'sent_at' => now(),
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+        ]);
+
+        UserNotification::query()->create([
+            'notification_id' => (int) $notification->id,
+            'user_id' => $userId,
+            'is_read' => 0,
+            'delivered' => 1,
+            'delivered_at' => now(),
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+        ]);
+    }
+}
diff --git a/app/Services/Payments/PaymentNotificationService.php b/app/Services/Payments/PaymentNotificationService.php
new file mode 100644
index 00000000..c9ad0fb7
--- /dev/null
+++ b/app/Services/Payments/PaymentNotificationService.php
@@ -0,0 +1,396 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Configuration;
+use App\Models\PaymentNotificationLog;
+use App\Models\User;
+use App\Services\EmailService;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class PaymentNotificationService
+{
+    public function __construct(
+        private EmailService $emailService,
+        private PaymentNotificationDispatchService $dispatchService
+    ) {
+    }
+
+    public function listLogs(?string $from, ?string $to, ?string $type): array
+    {
+        $query = PaymentNotificationLog::query()->with('parent')->orderByDesc('sent_at');
+
+        if (!empty($from)) {
+            $query->where('sent_at', '>=', $from);
+        }
+        if (!empty($to)) {
+            $query->where('sent_at', '<=', $to);
+        }
+        if (!empty($type)) {
+            $query->where('type', $type);
+        }
+
+        return $query->get()->all();
+    }
+
+    public function send(array $payload): array
+    {
+        $parentId = (int) ($payload['parent_id'] ?? 0);
+        $typeInput = (string) ($payload['type'] ?? '');
+        $force = (bool) ($payload['force'] ?? false);
+        $schoolYear = (string) ($payload['school_year'] ?? (Configuration::getConfig('school_year') ?? date('Y')));
+
+        $tzName = $this->getTimezone();
+        $tz = new \DateTimeZone($tzName);
+        $now = new \DateTime('now', $tz);
+        $year = (int) $now->format('Y');
+        $month = (int) $now->format('n');
+
+        $results = [
+            'sent' => 0,
+            'skipped' => 0,
+            'failed' => 0,
+            'details' => [],
+        ];
+
+        if ($parentId > 0) {
+            $result = $this->sendToParent($parentId, $typeInput, $schoolYear, $year, $month, $now, $force, false);
+            $results = $this->mergeResults($results, $result);
+        } else {
+            $parentIds = $this->getParentsWithInvoices($schoolYear);
+            foreach ($parentIds as $pid) {
+                $result = $this->sendToParent($pid, $typeInput, $schoolYear, $year, $month, $now, $force, true);
+                $results = $this->mergeResults($results, $result);
+            }
+        }
+
+        return $results;
+    }
+
+    private function sendToParent(
+        int $parentId,
+        string $typeInput,
+        string $schoolYear,
+        int $year,
+        int $month,
+        \DateTime $now,
+        bool $force,
+        bool $notifyHeads
+    ): array {
+        $results = ['sent' => 0, 'skipped' => 0, 'failed' => 0, 'details' => []];
+
+        [$balance, $latestInv] = $this->computeBalance($parentId, $schoolYear);
+
+        $type = $this->resolveType($parentId, $schoolYear, $typeInput);
+
+        if (!$force && PaymentNotificationLog::existsForPeriod($parentId, $year, $month, $type)) {
+            $results['skipped']++;
+            $results['details'][] = ['parent_id' => $parentId, 'result' => 'already_sent'];
+            return $results;
+        }
+
+        if ($balance <= 0 && !$force) {
+            $results['skipped']++;
+            $results['details'][] = ['parent_id' => $parentId, 'result' => 'no_balance'];
+            return $results;
+        }
+
+        [$subject, $body] = $this->composeMessage($parentId, $balance, $schoolYear, $now);
+        $installmentInfo = $this->computeInstallmentSuggestion($balance);
+
+        $toEmail = $this->getUserEmail($parentId);
+        $ccEmail = $this->getSecondaryGuardianEmail($parentId);
+
+        $ok = $toEmail ? $this->emailService->send($toEmail, $subject, $body, 'finance') : false;
+        if ($ok && $ccEmail && strcasecmp($ccEmail, (string) $toEmail) !== 0) {
+            $this->emailService->send($ccEmail, $subject, $body, 'finance');
+        }
+
+        PaymentNotificationLog::query()->create([
+            'parent_id' => $parentId,
+            'invoice_id' => $latestInv,
+            'school_year' => $schoolYear,
+            'period_year' => $year,
+            'period_month' => $month,
+            'type' => $type,
+            'to_email' => $toEmail,
+            'cc_email' => $ccEmail,
+            'head_fa_notified' => $notifyHeads ? 1 : 0,
+            'subject' => $subject,
+            'body' => $body,
+            'status' => $ok ? 'sent' : 'failed',
+            'error_message' => $ok ? null : 'Missing/invalid email or send failed',
+            'balance_snapshot' => $balance,
+            'sent_at' => $now->format('Y-m-d H:i:s'),
+        ]);
+
+        if ($ok) {
+            $results['sent']++;
+            $results['details'][] = [
+                'parent_id' => $parentId,
+                'result' => 'sent',
+                'balance' => $balance,
+                'installment_due' => $installmentInfo['installment_due'],
+                'remaining' => $installmentInfo['remaining_installments'],
+            ];
+        } else {
+            $results['failed']++;
+            $results['details'][] = ['parent_id' => $parentId, 'result' => 'failed'];
+        }
+
+        if ($notifyHeads) {
+            $this->notifyHeadsOfFinance($type, $parentId, $balance);
+        }
+
+        return $results;
+    }
+
+    private function computeBalance(int $parentId, string $schoolYear): array
+    {
+        $rows = DB::table('invoices')
+            ->select('id', 'total_amount')
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $hasStatus = DB::getSchemaBuilder()->hasColumn('payments', 'status');
+        $hasVoid = DB::getSchemaBuilder()->hasColumn('payments', 'is_void');
+
+        $sumBalance = 0.0;
+        $latestId = null;
+
+        foreach ($rows as $row) {
+            $invoiceId = (int) ($row['id'] ?? 0);
+            if ($invoiceId <= 0) {
+                continue;
+            }
+            if ($latestId === null) {
+                $latestId = $invoiceId;
+            }
+
+            $total = (float) ($row['total_amount'] ?? 0);
+
+            $qb = DB::table('payments')
+                ->selectRaw('COALESCE(SUM(paid_amount),0) AS total')
+                ->where('invoice_id', $invoiceId);
+
+            if ($hasStatus) {
+                $qb->where(function ($q) {
+                    $q->whereNotIn('status', [
+                        'void', 'voided', 'refunded', 'failed', 'chargeback', 'declined', 'reversed', 'canceled', 'cancelled',
+                    ])->orWhereNull('status');
+                });
+            }
+
+            if ($hasVoid) {
+                $qb->where(function ($q) {
+                    $q->where('is_void', 0)->orWhereNull('is_void');
+                });
+            }
+
+            $paid = (float) (optional($qb->first())->total ?? 0);
+
+            $disc = (float) (optional(DB::table('discount_usages')
+                ->selectRaw('COALESCE(SUM(discount_amount),0) AS total')
+                ->where('invoice_id', $invoiceId)
+                ->first())->total ?? 0);
+
+            $rfnd = (float) (optional(DB::table('refunds')
+                ->selectRaw('COALESCE(SUM(refund_paid_amount),0) AS total')
+                ->where('invoice_id', $invoiceId)
+                ->whereIn('status', ['Partial', 'Paid'])
+                ->first())->total ?? 0);
+
+            $sumBalance += max(0.0, round($total - $disc - $paid - $rfnd, 2));
+        }
+
+        return [$sumBalance, $latestId];
+    }
+
+    private function resolveType(int $parentId, string $schoolYear, string $typeInput): string
+    {
+        if (in_array($typeInput, ['no_payment', 'installment'], true)) {
+            return $typeInput;
+        }
+
+        $hasPayments = DB::table('payments')
+            ->where('parent_id', $parentId)
+            ->where('school_year', $schoolYear)
+            ->count() > 0;
+
+        return $hasPayments ? 'installment' : 'no_payment';
+    }
+
+    private function composeMessage(int $parentId, float $balance, string $schoolYear, \DateTime $now): array
+    {
+        $user = User::query()->find($parentId);
+        $parentName = $user ? trim(($user->firstname ?? '') . ' ' . ($user->lastname ?? '')) : '';
+        $greeting = $parentName !== '' ? "Dear {$parentName}," : 'Dear Parent,';
+
+        $monthYear = $now->format('F Y');
+        $subject = sprintf('Monthly Tuition Reminder — %s', $schoolYear);
+        $balanceFmt = '$' . number_format($balance, 2);
+        $intro = 'This is your monthly installment reminder for ' . $schoolYear . '.';
+
+        $installmentInfo = $this->computeInstallmentSuggestion($balance);
+
+        $bodyHtml = <<<HTML
+            <div style="font-family:Arial,Helvetica,sans-serif; font-size:14px; color:#212529; line-height:1.5;">
+              <h2 style="margin:0 0 10px; font-size:18px;">Monthly Tuition Reminder</h2>
+              <p>{$greeting}</p>
+              <p>{$intro}</p>
+              <p><strong>Current Outstanding Balance:</strong> {$balanceFmt}</p>
+              <ul>
+                <li><strong>Remaining installments:</strong> {$installmentInfo['remaining_installments']}</li>
+                <li><strong>Suggested installment this month:</strong> {$installmentInfo['installment_due_fmt']}</li>
+                <li><strong>Maximum installments available:</strong> {$installmentInfo['max_installments']}</li>
+              </ul>
+              <p>As a friendly reminder, our tuition installments are due at the beginning of each month.</p>
+              <p>You can review your invoice and payment options by logging in to your parent portal.</p>
+              <p>Thank you for your prompt attention.</p>
+              <p><em>Reminder Period:</em> {$monthYear}</p>
+            </div>
+        HTML;
+
+        if (view()->exists('emails._wrap_layout')) {
+            $body = view('emails._wrap_layout', [
+                'title' => 'Monthly Tuition Reminder',
+                'body_html' => $bodyHtml,
+            ], ['saveData' => true]);
+        } else {
+            $body = $bodyHtml;
+        }
+
+        return [$subject, $body];
+    }
+
+    private function computeInstallmentSuggestion(float $balance): array
+    {
+        $installmentEndRaw = (string) (Configuration::getConfig('installment_date') ?? '');
+        $tzName = $this->getTimezone();
+        $tz = new \DateTimeZone($tzName);
+        $today = new \DateTimeImmutable('today', $tz);
+
+        $end = null;
+        if ($installmentEndRaw !== '') {
+            try {
+                $end = new \DateTimeImmutable($installmentEndRaw, $tz);
+            } catch (\Throwable $e) {
+                $end = null;
+            }
+        }
+
+        $remMonths = 0;
+        if ($end) {
+            $y = (int) $end->format('Y') - (int) $today->format('Y');
+            $m = (int) $end->format('n') - (int) $today->format('n');
+            $remMonths = $y * 12 + $m;
+            if ((int) $end->format('j') > (int) $today->format('j')) {
+                $remMonths += 1;
+            }
+            if ($remMonths < 0) {
+                $remMonths = 0;
+            }
+        }
+
+        $remainingInstallments = max(1, $remMonths);
+        $maxInstallments = max($remMonths ?: 0, $balance > 0 ? 2 : 0);
+        $installmentDue = $remainingInstallments > 0 ? ($balance / $remainingInstallments) : 0;
+
+        return [
+            'remaining_installments' => $remainingInstallments,
+            'max_installments' => $maxInstallments,
+            'installment_due' => round($installmentDue, 2),
+            'installment_due_fmt' => '$' . number_format($installmentDue, 2),
+        ];
+    }
+
+    private function getSecondaryGuardianEmail(int $primaryUserId): ?string
+    {
+        $row = DB::table('family_guardians')->where('user_id', $primaryUserId)->first();
+        if (!$row || empty($row->family_id)) {
+            return null;
+        }
+
+        $others = DB::table('family_guardians')
+            ->where('family_id', (int) $row->family_id)
+            ->where('user_id', '!=', $primaryUserId)
+            ->where('receive_emails', 1)
+            ->get()
+            ->map(fn ($r) => (array) $r)
+            ->all();
+
+        foreach ($others as $g) {
+            $email = (string) (DB::table('users')->where('id', (int) ($g['user_id'] ?? 0))->value('email') ?? '');
+            if ($email !== '' && filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                return $email;
+            }
+        }
+
+        return null;
+    }
+
+    private function getUserEmail(int $userId): ?string
+    {
+        $email = (string) (DB::table('users')->where('id', $userId)->value('email') ?? '');
+        if ($email === '' || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            return null;
+        }
+        return $email;
+    }
+
+    private function notifyHeadsOfFinance(string $type, int $parentId, float $balance): void
+    {
+        try {
+            $heads = User::getUsersByRole('head of department (finance)');
+            if (empty($heads)) {
+                $heads = User::getUsersByRole('accountant');
+            }
+
+            foreach ($heads as $user) {
+                $this->dispatchService->notifyUser(
+                    (int) ($user['id'] ?? 0),
+                    'Payment Reminder Sent',
+                    sprintf('A %s reminder was sent to parent #%d (balance: $%0.2f).', $type, $parentId, $balance),
+                    ['in_app']
+                );
+            }
+        } catch (\Throwable $e) {
+            Log::warning('Unable to notify heads of finance: ' . $e->getMessage());
+        }
+    }
+
+    private function mergeResults(array $base, array $update): array
+    {
+        $base['sent'] += $update['sent'] ?? 0;
+        $base['skipped'] += $update['skipped'] ?? 0;
+        $base['failed'] += $update['failed'] ?? 0;
+        if (!empty($update['details'])) {
+            $base['details'] = array_merge($base['details'], $update['details']);
+        }
+        return $base;
+    }
+
+    private function getParentsWithInvoices(string $schoolYear): array
+    {
+        $rows = DB::table('invoices')
+            ->selectRaw('DISTINCT parent_id')
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        return array_values(array_unique(array_map(static fn ($r) => (int) ($r['parent_id'] ?? 0), $rows)));
+    }
+
+    private function getTimezone(): string
+    {
+        if (function_exists('user_timezone')) {
+            return (string) user_timezone();
+        }
+        return (string) (config('app.timezone') ?: 'UTC');
+    }
+}
diff --git a/app/Services/Payments/PaymentPlanService.php b/app/Services/Payments/PaymentPlanService.php
new file mode 100644
index 00000000..2e769977
--- /dev/null
+++ b/app/Services/Payments/PaymentPlanService.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Configuration;
+use App\Models\Payment;
+use Illuminate\Support\Facades\Schema;
+
+class PaymentPlanService
+{
+    public function createPlan(array $payload): Payment
+    {
+        $schoolYear = $payload['school_year'] ?? Configuration::getConfig('school_year');
+        $semester = $payload['semester'] ?? Configuration::getConfig('semester');
+
+        $data = [
+            'parent_id' => (int) $payload['parent_id'],
+            'total_amount' => (float) $payload['total_amount'],
+            'number_of_installments' => (int) $payload['number_of_installments'],
+            'paid_amount' => 0,
+            'balance' => (float) $payload['total_amount'],
+            'payment_date' => $payload['payment_date'] ?? null,
+            'payment_method' => $payload['payment_method'] ?? null,
+            'status' => $payload['status'] ?? 'Pending',
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+        ];
+
+        if (isset($payload['invoice_id']) && Schema::hasColumn('payments', 'invoice_id')) {
+            $data['invoice_id'] = (int) $payload['invoice_id'];
+        }
+
+        if (isset($payload['payment_type']) && Schema::hasColumn('payments', 'payment_type')) {
+            $data['payment_type'] = $payload['payment_type'];
+        }
+
+        return Payment::query()->create($data);
+    }
+}
diff --git a/app/Services/Payments/PaymentTransactionService.php b/app/Services/Payments/PaymentTransactionService.php
new file mode 100644
index 00000000..0c011e0e
--- /dev/null
+++ b/app/Services/Payments/PaymentTransactionService.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\PaymentTransaction;
+
+class PaymentTransactionService
+{
+    public function create(array $payload): PaymentTransaction
+    {
+        $data = [
+            'transaction_id' => $payload['transaction_id'],
+            'payment_id' => (int) $payload['payment_id'],
+            'transaction_date' => $payload['transaction_date'],
+            'amount' => (float) $payload['amount'],
+            'payment_method' => $payload['payment_method'],
+            'payment_status' => $payload['payment_status'] ?? 'Pending',
+            'transaction_fee' => $payload['transaction_fee'] ?? null,
+            'payment_reference' => $payload['payment_reference'] ?? null,
+            'is_full_payment' => !empty($payload['is_full_payment']),
+            'school_year' => $payload['school_year'] ?? null,
+            'semester' => $payload['semester'] ?? null,
+        ];
+
+        return PaymentTransaction::query()->create($data);
+    }
+
+    public function getByPayment(int $paymentId): array
+    {
+        return PaymentTransaction::getTransactionsByPaymentId($paymentId);
+    }
+
+    public function updateStatus(string $transactionId, string $status): bool
+    {
+        return PaymentTransaction::updateTransactionStatus($transactionId, $status);
+    }
+}
diff --git a/app/Services/Payments/PaypalPaymentService.php b/app/Services/Payments/PaypalPaymentService.php
new file mode 100644
index 00000000..0fdf387c
--- /dev/null
+++ b/app/Services/Payments/PaypalPaymentService.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Payment;
+use Illuminate\Support\Facades\Log;
+
+class PaypalPaymentService
+{
+    public function getRedirectUrl(): string
+    {
+        return (string) (config('services.paypal.payment_url')
+            ?: env('PAYPAL_PAYMENT_URL')
+            ?: 'https://www.paypal.com/ncp/payment/87FJL3EV8C7NE');
+    }
+
+    public function createPayment(int $paymentId): array
+    {
+        $payment = Payment::query()->find($paymentId);
+        if (!$payment) {
+            throw new \RuntimeException('Payment not found.');
+        }
+
+        if (!$this->sdkAvailable()) {
+            return [
+                'redirect_url' => $this->getRedirectUrl(),
+                'mode' => 'hosted',
+                'message' => 'PayPal SDK not installed; using hosted redirect URL.',
+            ];
+        }
+
+        try {
+            $apiContext = $this->buildApiContext();
+
+            $payer = new \PayPal\Api\Payer();
+            $payer->setPaymentMethod('paypal');
+
+            $amount = new \PayPal\Api\Amount();
+            $amount->setCurrency('USD')->setTotal($payment->balance ?? $payment->total_amount ?? 0);
+
+            $transaction = new \PayPal\Api\Transaction();
+            $transaction->setAmount($amount)
+                ->setDescription('Payment for school fees')
+                ->setInvoiceNumber(uniqid('inv_', true));
+
+            $paypalPayment = new \PayPal\Api\Payment();
+            $paypalPayment->setIntent('sale')
+                ->setPayer($payer)
+                ->setTransactions([$transaction]);
+
+            $redirectUrls = new \PayPal\Api\RedirectUrls();
+            $redirectUrls->setReturnUrl(url('/api/v1/finance/paypal/execute'))
+                ->setCancelUrl(url('/api/v1/finance/paypal/cancel'));
+
+            $paypalPayment->setRedirectUrls($redirectUrls);
+            $paypalPayment->create($apiContext);
+
+            session()->put('paypalPaymentId', $paypalPayment->getId());
+            session()->put('paymentId', $paymentId);
+
+            return [
+                'redirect_url' => $paypalPayment->getApprovalLink(),
+                'mode' => 'sdk',
+            ];
+        } catch (\Throwable $e) {
+            Log::error('PayPal create payment failed: ' . $e->getMessage());
+            throw new \RuntimeException('Unable to create PayPal payment.');
+        }
+    }
+
+    public function executePayment(string $payerId, ?string $paypalPaymentId = null): void
+    {
+        if (!$this->sdkAvailable()) {
+            throw new \RuntimeException('PayPal SDK not installed.');
+        }
+
+        $paymentId = $paypalPaymentId ?: (string) session()->get('paypalPaymentId');
+        if (!$paymentId) {
+            throw new \RuntimeException('Missing PayPal payment ID.');
+        }
+
+        $apiContext = $this->buildApiContext();
+        $payment = \PayPal\Api\Payment::get($paymentId, $apiContext);
+        $execution = new \PayPal\Api\PaymentExecution();
+        $execution->setPayerId($payerId);
+
+        $payment->execute($execution, $apiContext);
+
+        $internalPaymentId = (int) session()->get('paymentId');
+        if ($internalPaymentId) {
+            Payment::query()->whereKey($internalPaymentId)->update(['status' => 'Completed']);
+        }
+    }
+
+    public function cancelPayment(): void
+    {
+        // no-op (client handles redirect)
+    }
+
+    private function sdkAvailable(): bool
+    {
+        return class_exists(\PayPal\Rest\ApiContext::class)
+            && class_exists(\PayPal\Auth\OAuthTokenCredential::class);
+    }
+
+    private function buildApiContext(): \PayPal\Rest\ApiContext
+    {
+        $clientId = (string) (config('services.paypal.client_id') ?: env('PAYPAL_CLIENT_ID'));
+        $secret = (string) (config('services.paypal.secret') ?: env('PAYPAL_SECRET'));
+        $mode = (string) (config('services.paypal.mode') ?: env('PAYPAL_MODE') ?: 'sandbox');
+
+        $apiContext = new \PayPal\Rest\ApiContext(
+            new \PayPal\Auth\OAuthTokenCredential($clientId, $secret)
+        );
+
+        $apiContext->setConfig([
+            'mode' => $mode,
+            'http.headers' => ['Connection' => 'Close'],
+        ]);
+
+        return $apiContext;
+    }
+}
diff --git a/app/Services/Payments/PaypalTransactionsService.php b/app/Services/Payments/PaypalTransactionsService.php
new file mode 100644
index 00000000..096678a1
--- /dev/null
+++ b/app/Services/Payments/PaypalTransactionsService.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\PayPalPayment;
+
+class PaypalTransactionsService
+{
+    public function list(?string $keyword, int $perPage = 10)
+    {
+        $query = PayPalPayment::query()->orderByDesc('created_at');
+
+        if ($keyword) {
+            $query->where(function ($q) use ($keyword) {
+                $q->where('transaction_id', 'like', '%' . $keyword . '%')
+                    ->orWhere('payer_email', 'like', '%' . $keyword . '%')
+                    ->orWhere('event_type', 'like', '%' . $keyword . '%')
+                    ->orWhere('order_id', 'like', '%' . $keyword . '%')
+                    ->orWhere('parent_school_id', 'like', '%' . $keyword . '%');
+            });
+        }
+
+        return $query->paginate($perPage);
+    }
+
+    public function listAll(?string $keyword): array
+    {
+        $query = PayPalPayment::query()->orderByDesc('created_at');
+
+        if ($keyword) {
+            $query->where(function ($q) use ($keyword) {
+                $q->where('transaction_id', 'like', '%' . $keyword . '%')
+                    ->orWhere('payer_email', 'like', '%' . $keyword . '%')
+                    ->orWhere('event_type', 'like', '%' . $keyword . '%')
+                    ->orWhere('order_id', 'like', '%' . $keyword . '%')
+                    ->orWhere('parent_school_id', 'like', '%' . $keyword . '%');
+            });
+        }
+
+        return $query->get()->map(fn ($row) => (array) $row)->all();
+    }
+}
diff --git a/app/Services/PhoneFormatterService.php b/app/Services/PhoneFormatterService.php
new file mode 100644
index 00000000..fec9350b
--- /dev/null
+++ b/app/Services/PhoneFormatterService.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Services;
+
+class PhoneFormatterService
+{
+    public function formatPhoneNumber(string $number): ?string
+    {
+        $digits = preg_replace('/\D/', '', $number);
+
+        if (strlen($digits) === 10) {
+            return sprintf(
+                '%s-%s-%s',
+                substr($digits, 0, 3),
+                substr($digits, 3, 3),
+                substr($digits, 6)
+            );
+        }
+
+        return null;
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementBatchAssignmentService.php b/app/Services/Reimbursements/ReimbursementBatchAssignmentService.php
new file mode 100644
index 00000000..a56d19fb
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementBatchAssignmentService.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\ReimbursementBatch;
+use App\Models\ReimbursementBatchItem;
+use Illuminate\Support\Facades\Log;
+use RuntimeException;
+
+class ReimbursementBatchAssignmentService
+{
+    public function __construct(private ReimbursementLookupService $lookupService)
+    {
+    }
+
+    public function updateAssignment(
+        int $expenseId,
+        int $batchId,
+        ?int $adminId,
+        ?int $reimbursementId,
+        string $schoolYear,
+        string $semester
+    ): array {
+        if ($expenseId <= 0) {
+            throw new RuntimeException('Invalid expense id.');
+        }
+
+        $now = now();
+
+        $activeItem = ReimbursementBatchItem::query()
+            ->where('expense_id', $expenseId)
+            ->whereNull('unassigned_at')
+            ->first();
+
+        if ($batchId <= 0) {
+            if ($activeItem) {
+                $activeItem->update(['unassigned_at' => $now]);
+                if (!$reimbursementId && !empty($activeItem->reimbursement_id)) {
+                    $reimbursementId = (int) $activeItem->reimbursement_id;
+                }
+            }
+
+            return [
+                'batch_id' => 0,
+                'admin_id' => null,
+                'reimbursement_id' => $reimbursementId,
+            ];
+        }
+
+        $batch = ReimbursementBatch::query()->find($batchId);
+        if (!$batch || strtolower((string) $batch->status) !== ReimbursementBatch::STATUS_OPEN) {
+            throw new RuntimeException('Batch not found or already closed.');
+        }
+
+        $currentAdmin = $activeItem ? (int) ($activeItem->admin_id ?? 0) : null;
+        $activeSameBatch = $activeItem && (int) ($activeItem->batch_id ?? 0) === $batchId;
+        if ($activeSameBatch && ($currentAdmin === ($adminId ?? 0))) {
+            return [
+                'batch_id' => $batchId,
+                'admin_id' => $adminId,
+                'reimbursement_id' => $activeItem->reimbursement_id ?? null,
+            ];
+        }
+
+        if ($activeSameBatch) {
+            if (!$reimbursementId) {
+                $reimbursementId = $activeItem->reimbursement_id
+                    ? (int) $activeItem->reimbursement_id
+                    : $this->lookupService->findReimbursementIdForExpense($expenseId);
+            }
+
+            $activeItem->update([
+                'admin_id' => $adminId,
+                'assigned_at' => $now,
+                'reimbursement_id' => $reimbursementId,
+                'unassigned_at' => $adminId === null ? $now : null,
+            ]);
+
+            return [
+                'batch_id' => $batchId,
+                'admin_id' => $adminId,
+                'reimbursement_id' => $reimbursementId,
+            ];
+        }
+
+        if ($activeItem) {
+            $activeItem->update(['unassigned_at' => $now]);
+            if (!$reimbursementId && !empty($activeItem->reimbursement_id)) {
+                $reimbursementId = (int) $activeItem->reimbursement_id;
+            }
+        }
+
+        if (!$reimbursementId) {
+            $reimbursementId = $this->lookupService->findReimbursementIdForExpense($expenseId);
+        }
+
+        try {
+            ReimbursementBatchItem::query()->create([
+                'batch_id' => $batchId,
+                'expense_id' => $expenseId,
+                'reimbursement_id' => $reimbursementId,
+                'admin_id' => $adminId,
+                'assigned_at' => $now,
+                'school_year' => $schoolYear,
+                'semester' => $semester,
+            ]);
+        } catch (\Throwable $e) {
+            Log::error('Failed to assign expense to batch: ' . $e->getMessage(), [
+                'expense_id' => $expenseId,
+                'batch_id' => $batchId,
+            ]);
+            throw new RuntimeException('Unable to update batch assignment right now.');
+        }
+
+        return [
+            'batch_id' => $batchId,
+            'admin_id' => $adminId,
+            'reimbursement_id' => $reimbursementId,
+        ];
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementBatchService.php b/app/Services/Reimbursements/ReimbursementBatchService.php
new file mode 100644
index 00000000..698db538
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementBatchService.php
@@ -0,0 +1,154 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\Expense;
+use App\Models\Reimbursement;
+use App\Models\ReimbursementBatch;
+use App\Models\ReimbursementBatchAdminFile;
+use App\Models\ReimbursementBatchItem;
+use Illuminate\Support\Facades\DB;
+use RuntimeException;
+
+class ReimbursementBatchService
+{
+    public function __construct(private ReimbursementLookupService $lookupService)
+    {
+    }
+
+    public function createBatch(?string $title, int $userId, string $schoolYear, string $semester): array
+    {
+        $sequence = $this->nextYearlyBatchNumber($schoolYear);
+        $now = now();
+
+        $batch = ReimbursementBatch::query()->create([
+            'title' => $title !== null && trim($title) !== '' ? trim($title) : null,
+            'status' => ReimbursementBatch::STATUS_OPEN,
+            'created_by' => $userId ?: null,
+            'opened_at' => $now,
+            'school_year' => $schoolYear,
+            'semester' => $semester,
+            'yearly_batch_number' => $sequence,
+        ]);
+
+        $label = trim((string) $batch->title) !== '' ? (string) $batch->title : ('Batch #' . $sequence);
+        if (trim((string) $batch->title) === '') {
+            $batch->title = $label;
+            $batch->save();
+        }
+
+        return [
+            'batch_id' => (int) $batch->id,
+            'label' => $label,
+            'sequence' => $sequence,
+        ];
+    }
+
+    public function lockBatch(int $batchId, int $userId, string $schoolYear, string $semester): void
+    {
+        $batch = ReimbursementBatch::query()->find($batchId);
+        if (!$batch || strtolower((string) $batch->status) !== ReimbursementBatch::STATUS_OPEN) {
+            throw new RuntimeException('Batch not found or already closed.');
+        }
+
+        $adminRows = ReimbursementBatchItem::query()
+            ->selectRaw('DISTINCT COALESCE(admin_id, 0) AS admin_id')
+            ->where('batch_id', $batchId)
+            ->whereNull('unassigned_at')
+            ->get();
+
+        $adminIds = array_values(array_unique($adminRows->pluck('admin_id')->map(fn ($id) => (int) $id)->all()));
+        $requiredAdmins = array_values(array_filter($adminIds, static fn ($adminId) => $adminId > 0));
+
+        if (!empty($requiredAdmins)) {
+            $uploadedAdminIds = ReimbursementBatchAdminFile::query()
+                ->where('batch_id', $batchId)
+                ->whereIn('admin_id', $requiredAdmins)
+                ->pluck('admin_id')
+                ->map(fn ($id) => (int) $id)
+                ->unique()
+                ->values()
+                ->all();
+
+            foreach ($requiredAdmins as $adminId) {
+                if (!in_array($adminId, $uploadedAdminIds, true)) {
+                    throw new RuntimeException('All admin sections must have a check file before submitting the batch.');
+                }
+            }
+        }
+
+        DB::transaction(function () use ($batchId, $userId, $schoolYear, $semester) {
+            $items = DB::table('reimbursement_batch_items as bi')
+                ->selectRaw('bi.id as batch_item_id, bi.reimbursement_id as batch_reimb_id, bi.expense_id, e.amount, e.purchased_by, e.description, e.reimbursement_id as expense_reimb_id, e.school_year as expense_school_year, e.semester as expense_semester')
+                ->join('expenses as e', 'e.id', '=', 'bi.expense_id')
+                ->where('bi.batch_id', $batchId)
+                ->whereNull('bi.unassigned_at')
+                ->get();
+
+            foreach ($items as $item) {
+                $expenseId = (int) ($item->expense_id ?? 0);
+                $recipientId = (int) ($item->purchased_by ?? 0);
+                if ($expenseId <= 0 || $recipientId <= 0) {
+                    continue;
+                }
+
+                $reimbId = $item->batch_reimb_id ?: ($item->expense_reimb_id ?: $this->lookupService->findReimbursementIdForExpense($expenseId));
+
+                if (!$reimbId) {
+                    $payload = [
+                        'expense_id' => $expenseId,
+                        'amount' => (float) ($item->amount ?? 0),
+                        'reimbursed_to' => $recipientId,
+                        'approved_by' => $userId ?: null,
+                        'description' => trim((string) ($item->description ?? '')),
+                        'status' => 'Paid',
+                        'added_by' => $userId ?: null,
+                        'school_year' => $item->expense_school_year ?: $schoolYear,
+                        'semester' => $item->expense_semester ?: $semester,
+                        'reimbursement_method' => 'Check',
+                        'batch_number' => $batchId,
+                        'created_at' => now(),
+                        'updated_at' => now(),
+                    ];
+
+                    $reimbId = (int) Reimbursement::query()->create($payload)->id;
+                }
+
+                if ($reimbId) {
+                    Reimbursement::query()->where('id', $reimbId)->update([
+                        'batch_number' => $batchId,
+                        'approved_by' => $userId ?: null,
+                        'status' => 'Paid',
+                    ]);
+
+                    Expense::query()->where('id', $expenseId)->update(['reimbursement_id' => $reimbId]);
+                    if (!empty($item->batch_item_id)) {
+                        ReimbursementBatchItem::query()->where('id', (int) $item->batch_item_id)->update([
+                            'reimbursement_id' => $reimbId,
+                        ]);
+                    }
+                }
+            }
+
+            ReimbursementBatch::query()->where('id', $batchId)->update([
+                'status' => ReimbursementBatch::STATUS_CLOSED,
+                'closed_at' => now(),
+                'closed_by' => $userId ?: null,
+            ]);
+        });
+    }
+
+    private function nextYearlyBatchNumber(string $schoolYear): int
+    {
+        $year = trim($schoolYear);
+        if ($year === '') {
+            return 1;
+        }
+
+        $max = ReimbursementBatch::query()
+            ->where('school_year', $year)
+            ->max('yearly_batch_number');
+
+        return ((int) $max) + 1;
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementContextService.php b/app/Services/Reimbursements/ReimbursementContextService.php
new file mode 100644
index 00000000..08e2323b
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementContextService.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\Configuration;
+
+class ReimbursementContextService
+{
+    public function getSchoolYear(): string
+    {
+        return (string) (Configuration::getConfig('school_year') ?? date('Y'));
+    }
+
+    public function getSemester(): string
+    {
+        return (string) (Configuration::getConfig('semester') ?? 'Fall');
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementCrudService.php b/app/Services/Reimbursements/ReimbursementCrudService.php
new file mode 100644
index 00000000..7bbb6ca1
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementCrudService.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\Expense;
+use App\Models\Reimbursement;
+use RuntimeException;
+
+class ReimbursementCrudService
+{
+    public function store(array $payload, int $userId, string $schoolYear, string $semester, ?string $receiptName): Reimbursement
+    {
+        $expenseId = (int) ($payload['expense_id'] ?? 0);
+        if ($expenseId > 0) {
+            $expense = Expense::query()->find($expenseId);
+            if ($expense && strcasecmp((string) $expense->category, 'Donation') === 0) {
+                throw new RuntimeException('Donation expenses are tracked but should not be reimbursed.');
+            }
+        }
+
+        $methodRaw = (string) ($payload['reimbursement_method'] ?? '');
+        $method = ucfirst(strtolower($methodRaw));
+
+        $reimb = Reimbursement::query()->create([
+            'expense_id' => $expenseId ?: null,
+            'amount' => $payload['amount'],
+            'reimbursed_to' => (int) $payload['reimbursed_to'],
+            'description' => $payload['description'] ?? null,
+            'reimbursement_method' => $method,
+            'check_number' => $method === 'Check' ? ($payload['check_number'] ?? null) : null,
+            'receipt_path' => $receiptName,
+            'school_year' => $payload['school_year'] ?? $schoolYear,
+            'semester' => $payload['semester'] ?? $semester,
+            'added_by' => $userId ?: null,
+            'approved_by' => $userId ?: null,
+            'status' => 'Paid',
+        ]);
+
+        if ($expenseId > 0) {
+            Expense::query()->where('id', $expenseId)->update(['reimbursement_id' => $reimb->id]);
+        }
+
+        return $reimb;
+    }
+
+    public function process(array $payload, int $userId, string $schoolYear, string $semester, ?string $receiptName): Reimbursement
+    {
+        $expenseId = (int) ($payload['expense_id'] ?? 0);
+        if ($expenseId > 0) {
+            $expense = Expense::query()->find($expenseId);
+            if ($expense && strcasecmp((string) $expense->category, 'Donation') === 0) {
+                throw new RuntimeException('Donation expenses are tracked but should not be reimbursed.');
+            }
+        }
+
+        $reimb = Reimbursement::query()->create([
+            'expense_id' => $expenseId ?: null,
+            'amount' => $payload['amount'],
+            'reimbursed_to' => (int) $payload['reimbursed_to'],
+            'approved_by' => $userId ?: null,
+            'receipt_path' => $receiptName,
+            'description' => $payload['description'] ?? 'Expense reimbursement',
+            'status' => 'Paid',
+            'added_by' => $userId ?: null,
+            'school_year' => $payload['school_year'] ?? $schoolYear,
+            'semester' => $payload['semester'] ?? $semester,
+            'check_number' => $payload['check_number'] ?? null,
+            'reimbursement_method' => $payload['reimbursement_method'] ?? null,
+        ]);
+
+        if ($expenseId > 0) {
+            Expense::query()->where('id', $expenseId)->update(['reimbursement_id' => $reimb->id]);
+        }
+
+        return $reimb;
+    }
+
+    public function update(Reimbursement $reimb, array $payload, int $userId, ?string $receiptName): Reimbursement
+    {
+        $methodRaw = (string) ($payload['reimbursement_method'] ?? $reimb->reimbursement_method);
+        $method = ucfirst(strtolower($methodRaw));
+
+        $updateData = [
+            'amount' => $payload['amount'],
+            'reimbursed_to' => (int) $payload['reimbursed_to'],
+            'description' => $payload['description'] ?? null,
+            'reimbursement_method' => $method,
+            'check_number' => $method === 'Check' ? ($payload['check_number'] ?? null) : null,
+            'receipt_path' => $receiptName,
+            'updated_by' => $userId ?: null,
+        ];
+
+        $reimb->update($updateData);
+
+        return $reimb->refresh();
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementDonationService.php b/app/Services/Reimbursements/ReimbursementDonationService.php
new file mode 100644
index 00000000..6413fee3
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementDonationService.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\Expense;
+use App\Models\ReimbursementBatchItem;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use RuntimeException;
+
+class ReimbursementDonationService
+{
+    public function markDonation(int $expenseId, int $userId): void
+    {
+        if ($expenseId <= 0) {
+            throw new RuntimeException('Invalid expense id.');
+        }
+
+        $expense = Expense::query()->find($expenseId);
+        if (!$expense) {
+            throw new RuntimeException('Expense not found.');
+        }
+
+        if (!empty($expense->reimbursement_id)) {
+            throw new RuntimeException('Expense is already tied to a reimbursement.');
+        }
+
+        $now = now();
+
+        DB::beginTransaction();
+        try {
+            ReimbursementBatchItem::query()
+                ->where('expense_id', $expenseId)
+                ->whereNull('unassigned_at')
+                ->update(['unassigned_at' => $now]);
+
+            $expense->update([
+                'category' => 'Donation',
+                'status' => 'approved',
+                'status_reason' => 'Marked as Donation (non-reimbursable).',
+                'approved_by' => $userId ?: null,
+                'updated_by' => $userId ?: null,
+                'reimbursement_id' => null,
+            ]);
+
+            DB::commit();
+        } catch (\Throwable $e) {
+            DB::rollBack();
+            Log::error('Failed to mark donation: ' . $e->getMessage(), ['expense_id' => $expenseId]);
+            throw new RuntimeException('Unable to mark donation right now.');
+        }
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementEmailService.php b/app/Services/Reimbursements/ReimbursementEmailService.php
new file mode 100644
index 00000000..31adbcf6
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementEmailService.php
@@ -0,0 +1,358 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\ReimbursementBatch;
+use App\Models\ReimbursementBatchAdminFile;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
+use ZipArchive;
+
+class ReimbursementEmailService
+{
+    public function __construct(private ReimbursementRecipientService $recipients)
+    {
+    }
+
+    public function sendBatchEmail(
+        int $batchId,
+        string $recipientEmail,
+        string $message,
+        array $receiptIds,
+        array $checkIds
+    ): bool {
+        $batch = ReimbursementBatch::query()->find($batchId);
+        if (!$batch) {
+            throw new \RuntimeException('Requested batch was not found.');
+        }
+
+        $receiptRows = !empty($receiptIds) ? $this->fetchBatchReceiptRows($batchId, $receiptIds) : [];
+
+        $checkRows = [];
+        if (!empty($checkIds)) {
+            $checkRows = ReimbursementBatchAdminFile::query()
+                ->select('id as file_id', 'admin_id', 'filename', 'original_filename', 'uploaded_at')
+                ->where('batch_id', $batchId)
+                ->whereIn('id', $checkIds)
+                ->get()
+                ->toArray();
+
+            $adminLookup = [];
+            foreach ($this->recipients->adminRoster() as $admin) {
+                $adminLookup[(int) ($admin['id'] ?? 0)] = trim((string) (($admin['firstname'] ?? '') . ' ' . ($admin['lastname'] ?? '')));
+            }
+            foreach ($checkRows as &$row) {
+                $aid = (int) ($row['admin_id'] ?? 0);
+                $row['admin'] = $adminLookup[$aid] ?? ($aid > 0 ? 'Admin #' . $aid : 'Admin');
+            }
+            unset($row);
+        }
+
+        $tempDir = storage_path('tmp');
+        if (!is_dir($tempDir)) {
+            mkdir($tempDir, 0755, true);
+        }
+
+        $cleanupPaths = [];
+
+        $batchLabel = trim((string) ($batch->title ?? '')) ?: ('Batch #' . ((int) ($batch->yearly_batch_number ?? $batchId)));
+        $batchFileLabel = $this->sanitizeAttachmentComponent($batchLabel);
+
+        $csvPath = tempnam($tempDir, 'batch_csv_');
+        $cleanupPaths[] = $csvPath;
+        $csvHandle = fopen($csvPath, 'w');
+        if (!$csvHandle) {
+            if (is_file($csvPath)) {
+                @unlink($csvPath);
+            }
+            throw new \RuntimeException('Unable to create the summary file.');
+        }
+
+        $batchClosedDate = $this->formatCsvDate($batch->closed_at ?? null);
+        $this->writeBatchCsvMetadata($csvHandle, $batchLabel, $batch->toArray());
+        $this->writeBatchCsvSummary($csvHandle, $receiptRows, $batchClosedDate);
+        fclose($csvHandle);
+
+        $csvAttachmentName = $batchFileLabel . '_summary.csv';
+
+        $receiptsArchivePath = null;
+        $receiptZipCreated = false;
+        if (!empty($receiptRows)) {
+            $archivePath = $tempDir . '/batch_receipts_' . $batchId . '_' . date('Ymd_His') . '_' . bin2hex(random_bytes(4)) . '.zip';
+            $zip = new ZipArchive();
+            $added = 0;
+            $usedNames = [];
+            if ($zip->open($archivePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) {
+                foreach ($receiptRows as $row) {
+                    $sourcePath = storage_path('uploads/receipts/' . basename((string) ($row['receipt_filename'] ?? '')));
+                    if (!is_file($sourcePath)) {
+                        continue;
+                    }
+                    $firstName = $row['purchaser_firstname'] ?? '';
+                    if (trim($firstName) === '' && !empty($row['purchaser_lastname'] ?? '')) {
+                        $firstName = $row['purchaser_lastname'];
+                    }
+                    $firstName = $this->sanitizeAttachmentComponent($firstName);
+                    $vendorPart = $this->sanitizeAttachmentComponent($row['retailor'] ?? '');
+                    $datePart = $this->formatAttachmentDate($row['purchase_date'] ?? '');
+                    $extension = pathinfo($sourcePath, PATHINFO_EXTENSION);
+                    $extPart = $extension !== '' ? ('.' . strtolower($extension)) : '';
+                    $baseName = $firstName . '_' . $vendorPart . '_' . $datePart;
+                    $entryName = $this->uniqueZipEntryName($baseName, $extPart, $usedNames);
+                    if ($zip->addFile($sourcePath, $entryName)) {
+                        $added++;
+                    }
+                }
+                $zip->close();
+            }
+            if ($added > 0 && is_file($archivePath)) {
+                $receiptsArchivePath = $archivePath;
+                $cleanupPaths[] = $archivePath;
+                $receiptZipCreated = true;
+            } elseif (is_file($archivePath)) {
+                @unlink($archivePath);
+            }
+        }
+
+        $checksArchivePath = null;
+        $checksAdded = 0;
+        if (!empty($checkRows)) {
+            $archivePath = $tempDir . '/batch_checks_' . $batchId . '_' . date('Ymd_His') . '_' . bin2hex(random_bytes(4)) . '.zip';
+            $zip = new ZipArchive();
+            $usedNames = [];
+            if ($zip->open($archivePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) {
+                foreach ($checkRows as $row) {
+                    $sourcePath = storage_path('uploads/reimbursements/' . basename((string) ($row['filename'] ?? '')));
+                    if (!is_file($sourcePath)) {
+                        continue;
+                    }
+                    $adminLabel = $row['admin'] ?? 'Admin';
+                    $firstToken = strtok($adminLabel, ' ');
+                    $namePart = $this->sanitizeAttachmentComponent($firstToken ?: $adminLabel);
+                    $extension = pathinfo($sourcePath, PATHINFO_EXTENSION);
+                    $extPart = $extension !== '' ? ('.' . strtolower($extension)) : '';
+                    $entryName = $this->uniqueZipEntryName($namePart, $extPart, $usedNames);
+                    if ($zip->addFile($sourcePath, $entryName)) {
+                        $checksAdded++;
+                    }
+                }
+                $zip->close();
+            }
+            if ($checksAdded > 0 && is_file($archivePath)) {
+                $checksArchivePath = $archivePath;
+                $cleanupPaths[] = $archivePath;
+            } elseif (is_file($archivePath)) {
+                @unlink($archivePath);
+            }
+        }
+
+        $attachmentSummary = ['CSV Summary'];
+        if ($receiptZipCreated) {
+            $attachmentSummary[] = 'Receipt Files';
+        }
+        if ($checksArchivePath) {
+            $attachmentSummary[] = 'Check Scans';
+        }
+
+        $subject = 'Reimbursement Batch Export: ' . $batchLabel;
+        $bodyParts = [
+            '<p>Please find attached the export for <strong>' . htmlspecialchars($batchLabel, ENT_QUOTES, 'UTF-8') . '</strong>.</p>',
+        ];
+        if (trim($message) !== '') {
+            $bodyParts[] = '<p><strong>Message:</strong><br>' . nl2br(htmlspecialchars($message, ENT_QUOTES, 'UTF-8')) . '</p>';
+        }
+        $bodyParts[] = '<p>Attachments: ' . htmlspecialchars(implode(', ', $attachmentSummary), ENT_QUOTES, 'UTF-8') . '.</p>';
+        $bodyParts[] = '<p>Regards,<br>Al Rahma Sunday School</p>';
+        $htmlBody = implode("\n", $bodyParts);
+
+        $attachments = [
+            ['path' => $csvPath, 'name' => $csvAttachmentName],
+        ];
+        if ($receiptsArchivePath) {
+            $attachments[] = ['path' => $receiptsArchivePath, 'name' => $batchFileLabel . '_receipts.zip'];
+        }
+        if ($checksArchivePath) {
+            $attachments[] = ['path' => $checksArchivePath, 'name' => $batchFileLabel . '_checks.zip'];
+        }
+
+        $sender = $this->resolveSender('general');
+
+        try {
+            Mail::html($htmlBody, function ($message) use ($recipientEmail, $subject, $sender, $attachments) {
+                $message->to($recipientEmail)->subject($subject);
+                if (!empty($sender['email'])) {
+                    $message->from($sender['email'], $sender['name']);
+                }
+                foreach ($attachments as $file) {
+                    if (!empty($file['path']) && is_file($file['path'])) {
+                        $message->attach($file['path'], ['as' => $file['name'] ?? basename($file['path'])]);
+                    }
+                }
+            });
+
+            return true;
+        } catch (\Throwable $e) {
+            Log::error('Failed to send batch export email: ' . $e->getMessage());
+            return false;
+        } finally {
+            foreach ($cleanupPaths as $path) {
+                if ($path && is_file($path)) {
+                    @unlink($path);
+                }
+            }
+        }
+    }
+
+    private function fetchBatchReceiptRows(int $batchId, array $receiptIds = []): array
+    {
+        $builder = DB::table('reimbursement_batch_items as bi')
+            ->select('e.id as expense_id', 'e.retailor', 'e.amount', 'e.description', 'e.receipt_path as receipt_filename', 'e.date_of_purchase as purchase_date', 'u.firstname as purchaser_firstname', 'u.lastname as purchaser_lastname')
+            ->join('expenses as e', 'e.id', '=', 'bi.expense_id')
+            ->leftJoin('users as u', 'u.id', '=', 'e.purchased_by')
+            ->where('bi.batch_id', $batchId);
+
+        if (!empty($receiptIds)) {
+            $builder->whereIn('e.id', $receiptIds);
+        }
+
+        $rows = $builder->get()->toArray();
+
+        return array_values(array_filter(array_map(static function ($row) {
+            return [
+                'expense_id' => $row->expense_id ?? null,
+                'retailor' => $row->retailor ?? null,
+                'amount' => $row->amount ?? null,
+                'description' => $row->description ?? null,
+                'receipt_filename' => $row->receipt_filename ?? null,
+                'purchase_date' => $row->purchase_date ?? null,
+                'purchaser_firstname' => $row->purchaser_firstname ?? null,
+                'purchaser_lastname' => $row->purchaser_lastname ?? null,
+            ];
+        }, $rows), static function ($row) {
+            return !empty($row['receipt_filename']);
+        }));
+    }
+
+    private function writeBatchCsvMetadata($handle, string $batchLabel, array $batch): void
+    {
+        $closedAtRaw = $batch['closed_at'] ?? null;
+        fputcsv($handle, ['Batch Title', $batchLabel]);
+        fputcsv($handle, ['School Year', $batch['school_year'] ?? '', 'Semester', $batch['semester'] ?? '', 'Closed At', $this->formatCsvDate($closedAtRaw)]);
+        fputcsv($handle, []);
+        fputcsv($handle, ['Amount', 'Credit', 'Paid', 'Balance', 'Date', 'By Who', 'Vendor', 'Description']);
+    }
+
+    private function writeBatchCsvSummary($handle, array $receiptRows, string $totalsDate = ''): void
+    {
+        $receiptTotalsByRecipient = [];
+        foreach ($receiptRows as $row) {
+            $recipientName = trim(($row['purchaser_firstname'] ?? '') . ' ' . ($row['purchaser_lastname'] ?? ''));
+            if ($recipientName === '') {
+                $recipientName = 'Unknown';
+            }
+            $vendor = trim((string) ($row['retailor'] ?? ''));
+            if ($vendor === '') {
+                $vendor = 'Vendor N/A';
+            }
+            $dateText = $this->formatCsvDate($row['purchase_date'] ?? null);
+            $descriptionValue = trim((string) ($row['description'] ?? ''));
+            $descriptionParts = $descriptionValue !== '' ? [$descriptionValue] : ['Receipt'];
+            $amountValue = (float) ($row['amount'] ?? 0);
+            $receiptTotalsByRecipient[$recipientName] = ($receiptTotalsByRecipient[$recipientName] ?? 0.0) + $amountValue;
+            fputcsv($handle, [
+                number_format($amountValue, 2, '.', ''),
+                '',
+                number_format($amountValue, 2, '.', ''),
+                '0.00',
+                $dateText,
+                $recipientName,
+                $vendor,
+                implode(' | ', $descriptionParts),
+            ]);
+        }
+        if (!empty($receiptTotalsByRecipient)) {
+            fputcsv($handle, []);
+            fputcsv($handle, ['Totals by Recipient', '', '', '', '', '', '', '']);
+            foreach ($receiptTotalsByRecipient as $recipient => $total) {
+                $formatted = number_format($total, 2, '.', '');
+                fputcsv($handle, [
+                    $formatted,
+                    '',
+                    $formatted,
+                    '0.00',
+                    $totalsDate,
+                    $recipient,
+                    '',
+                    '',
+                ]);
+            }
+        }
+    }
+
+    private function sanitizeAttachmentComponent(string $value): string
+    {
+        $clean = preg_replace('/[^A-Za-z0-9]+/', '_', trim((string) $value));
+        $clean = trim($clean, '_');
+        return $clean === '' ? 'unknown' : $clean;
+    }
+
+    private function formatAttachmentDate(?string $value): string
+    {
+        if (!$value) {
+            return 'unknown';
+        }
+        $timestamp = strtotime($value);
+        if ($timestamp === false) {
+            return 'unknown';
+        }
+        return date('Ymd', $timestamp);
+    }
+
+    private function uniqueZipEntryName(string $base, string $extension, array &$used): string
+    {
+        $candidate = $base . $extension;
+        $counter = 1;
+        while (isset($used[$candidate])) {
+            $candidate = $base . '_' . $counter . $extension;
+            $counter++;
+        }
+        $used[$candidate] = true;
+        return $candidate;
+    }
+
+    private function formatCsvDate(?string $value): string
+    {
+        if (!$value) {
+            return '';
+        }
+        $timestamp = strtotime($value);
+        if ($timestamp === false) {
+            return '';
+        }
+        return date('m-d-Y', $timestamp);
+    }
+
+    private function resolveSender(string $fromKey): array
+    {
+        $fromKey = $fromKey !== '' ? $fromKey : 'general';
+        $json = env('MAIL_SENDERS', '{}');
+        $senders = json_decode($json, true);
+
+        if (is_array($senders) && isset($senders[$fromKey])) {
+            $info = $senders[$fromKey];
+            return [
+                'name' => (string) ($info['name'] ?? 'Sender'),
+                'email' => (string) ($info['email'] ?? ''),
+            ];
+        }
+
+        $fallbackAddress = (string) (config('mail.from.address') ?: (getenv('SMTP_USER') ?: ''));
+        $fallbackName = (string) (config('mail.from.name') ?: 'Al Rahma Sunday School');
+
+        return [
+            'name' => $fallbackName,
+            'email' => $fallbackAddress,
+        ];
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementExportService.php b/app/Services/Reimbursements/ReimbursementExportService.php
new file mode 100644
index 00000000..f2c4d8f6
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementExportService.php
@@ -0,0 +1,233 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\ReimbursementBatch;
+use Illuminate\Support\Facades\DB;
+use RuntimeException;
+
+class ReimbursementExportService
+{
+    public function __construct(private ReimbursementRecipientService $recipients)
+    {
+    }
+
+    public function buildUnderProcessingCsv(): array
+    {
+        $builder = DB::table('expenses')
+            ->select('expenses.*', 'u.firstname as purchaser_firstname', 'u.lastname as purchaser_lastname')
+            ->leftJoin('users as u', 'u.id', '=', 'expenses.purchased_by')
+            ->where('expenses.status', 'approved')
+            ->whereNull('expenses.reimbursement_id')
+            ->where('expenses.category', '!=', 'Donation')
+            ->orderByDesc('expenses.created_at');
+
+        $records = $builder->get();
+        $grouped = [];
+
+        foreach ($records as $row) {
+            $personId = (int) ($row->purchased_by ?? 0);
+            $name = trim(($row->purchaser_firstname ?? '') . ' ' . ($row->purchaser_lastname ?? ''));
+            if ($name === '') {
+                $name = $row->purchaser_firstname ?? $row->purchaser_lastname ?? 'Unknown';
+            }
+            $key = $personId > 0 ? 'id_' . $personId : 'name_' . strtolower($name);
+            if (!isset($grouped[$key])) {
+                $grouped[$key] = [
+                    'name' => $name ?: 'Unknown',
+                    'total' => 0.0,
+                    'vendors' => [],
+                    'descriptions' => [],
+                ];
+            }
+
+            $amount = (float) ($row->amount ?? 0);
+            $grouped[$key]['total'] += $amount;
+
+            $vendor = trim((string) ($row->retailor ?? ''));
+            if ($vendor !== '' && !in_array($vendor, $grouped[$key]['vendors'], true)) {
+                $grouped[$key]['vendors'][] = $vendor;
+            }
+
+            $desc = trim((string) ($row->description ?? ''));
+            if ($desc !== '' && !in_array($desc, $grouped[$key]['descriptions'], true)) {
+                $grouped[$key]['descriptions'][] = $desc;
+            }
+        }
+
+        $rows = [];
+        $rows[] = ['Person', 'Total Amount', 'Vendors', 'Descriptions'];
+        foreach ($grouped as $entry) {
+            $rows[] = [
+                $entry['name'],
+                number_format($entry['total'], 2, '.', ''),
+                implode('; ', $entry['vendors']),
+                implode('; ', $entry['descriptions']),
+            ];
+        }
+
+        return [
+            'filename' => 'under_processing_expenses.csv',
+            'rows' => $rows,
+        ];
+    }
+
+    public function buildProcessedCsv(array $filters): array
+    {
+        $builder = DB::table('reimbursements')
+            ->select('reimbursements.*', 'u.firstname as reimb_firstname', 'u.lastname as reimb_lastname')
+            ->leftJoin('users as u', 'u.id', '=', 'reimbursements.reimbursed_to');
+
+        if (!empty($filters['semester'])) {
+            $builder->where('reimbursements.semester', $filters['semester']);
+        }
+        if (!empty($filters['status'])) {
+            $builder->where('reimbursements.status', $filters['status']);
+        }
+        if (!empty($filters['user_id'])) {
+            $builder->where('reimbursements.reimbursed_to', $filters['user_id']);
+        }
+        if (!empty($filters['school_year'])) {
+            $builder->where('reimbursements.school_year', $filters['school_year']);
+        }
+
+        $records = $builder->orderByDesc('reimbursements.created_at')->get();
+        $rows = [];
+        $rows[] = ['Amount', 'Reimbursed To', 'Status', 'Method', 'Check #', 'School Year', 'Semester', 'Date'];
+
+        foreach ($records as $row) {
+            $hasName = trim(($row->reimb_firstname ?? '') . ' ' . ($row->reimb_lastname ?? '')) !== '';
+            if (!$hasName) {
+                $label = $this->recipients->specialRecipientLabel($row->reimbursed_to ?? null);
+                if ($label !== null) {
+                    $row->reimb_firstname = $label;
+                    $row->reimb_lastname = '';
+                }
+            }
+
+            $rows[] = [
+                $row->amount,
+                trim(($row->reimb_firstname ?? '') . ' ' . ($row->reimb_lastname ?? '')),
+                $row->status,
+                $row->reimbursement_method ?? '-',
+                $row->check_number ?? '-',
+                $row->school_year ?? '-',
+                $row->semester ?? '-',
+                $row->created_at,
+            ];
+        }
+
+        return [
+            'filename' => 'reimbursements_export.csv',
+            'rows' => $rows,
+        ];
+    }
+
+    public function buildBatchCsv(int $batchId): array
+    {
+        $batch = ReimbursementBatch::query()->find($batchId);
+        if (!$batch) {
+            throw new RuntimeException('Batch not found.');
+        }
+
+        $batchLabel = trim((string) ($batch->title ?? '')) ?: ('Batch #' . $batchId);
+        $receiptRows = $this->fetchBatchReceiptRows($batchId);
+
+        $rows = [];
+        $this->writeBatchCsvMetadata($rows, $batchLabel, $batch->toArray());
+        $this->writeBatchCsvSummary($rows, $receiptRows, $this->formatCsvDate($batch->closed_at ?? null));
+
+        return [
+            'filename' => sprintf('batch_%d_items.csv', $batchId),
+            'rows' => $rows,
+        ];
+    }
+
+    private function fetchBatchReceiptRows(int $batchId, array $receiptIds = []): array
+    {
+        $builder = DB::table('reimbursement_batch_items as bi')
+            ->select('e.id as expense_id', 'e.retailor', 'e.amount', 'e.description', 'e.receipt_path as receipt_filename', 'e.date_of_purchase as purchase_date', 'u.firstname as purchaser_firstname', 'u.lastname as purchaser_lastname')
+            ->join('expenses as e', 'e.id', '=', 'bi.expense_id')
+            ->leftJoin('users as u', 'u.id', '=', 'e.purchased_by')
+            ->where('bi.batch_id', $batchId);
+
+        if (!empty($receiptIds)) {
+            $builder->whereIn('e.id', $receiptIds);
+        }
+
+        $rows = $builder->get()->toArray();
+
+        return array_values(array_filter($rows, static function ($row) {
+            return !empty($row->receipt_filename);
+        }));
+    }
+
+    private function writeBatchCsvMetadata(array &$rows, string $batchLabel, array $batch): void
+    {
+        $closedAtRaw = $batch['closed_at'] ?? null;
+        $rows[] = ['Batch Title', $batchLabel];
+        $rows[] = ['School Year', $batch['school_year'] ?? '', 'Semester', $batch['semester'] ?? '', 'Closed At', $this->formatCsvDate($closedAtRaw)];
+        $rows[] = [];
+        $rows[] = ['Amount', 'Credit', 'Paid', 'Balance', 'Date', 'By Who', 'Vendor', 'Description'];
+    }
+
+    private function writeBatchCsvSummary(array &$rows, array $receiptRows, string $totalsDate = ''): void
+    {
+        $receiptTotalsByRecipient = [];
+        foreach ($receiptRows as $row) {
+            $recipientName = trim(($row->purchaser_firstname ?? '') . ' ' . ($row->purchaser_lastname ?? ''));
+            if ($recipientName === '') {
+                $recipientName = 'Unknown';
+            }
+            $vendor = trim((string) ($row->retailor ?? ''));
+            if ($vendor === '') {
+                $vendor = 'Vendor N/A';
+            }
+            $dateText = $this->formatCsvDate($row->purchase_date ?? null);
+            $descriptionValue = trim((string) ($row->description ?? ''));
+            $descriptionParts = $descriptionValue !== '' ? [$descriptionValue] : ['Receipt'];
+            $amountValue = (float) ($row->amount ?? 0);
+            $receiptTotalsByRecipient[$recipientName] = ($receiptTotalsByRecipient[$recipientName] ?? 0.0) + $amountValue;
+            $rows[] = [
+                number_format($amountValue, 2, '.', ''),
+                '',
+                number_format($amountValue, 2, '.', ''),
+                '0.00',
+                $dateText,
+                $recipientName,
+                $vendor,
+                implode(' | ', $descriptionParts),
+            ];
+        }
+
+        if (!empty($receiptTotalsByRecipient)) {
+            $rows[] = [];
+            $rows[] = ['Totals by Recipient', '', '', '', '', '', '', ''];
+            foreach ($receiptTotalsByRecipient as $recipient => $total) {
+                $formatted = number_format($total, 2, '.', '');
+                $rows[] = [
+                    $formatted,
+                    '',
+                    $formatted,
+                    '0.00',
+                    $totalsDate,
+                    $recipient,
+                    '',
+                    '',
+                ];
+            }
+        }
+    }
+
+    private function formatCsvDate(?string $value): string
+    {
+        if (!$value) {
+            return '';
+        }
+        $timestamp = strtotime($value);
+        if ($timestamp === false) {
+            return '';
+        }
+        return date('m-d-Y', $timestamp);
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementFileService.php b/app/Services/Reimbursements/ReimbursementFileService.php
new file mode 100644
index 00000000..a99d60a7
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementFileService.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\ReimbursementBatchAdminFile;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Str;
+use RuntimeException;
+
+class ReimbursementFileService
+{
+    public function receiptUrl(?string $filename): ?string
+    {
+        if (!$filename) {
+            return null;
+        }
+        $safe = basename(trim($filename));
+        return $safe !== '' ? url('/api/v1/files/reimbursements/' . $safe) : null;
+    }
+
+    public function expenseReceiptUrl(?string $filename): ?string
+    {
+        if (!$filename) {
+            return null;
+        }
+        $safe = basename(trim($filename));
+        return $safe !== '' ? url('/api/v1/files/receipts/' . $safe) : null;
+    }
+
+    public function adminFileUrl(string $filename, string $mode = 'inline'): string
+    {
+        return url('/api/v1/finance/reimbursements/batches/admin-files/' . rawurlencode($filename) . '/' . $mode);
+    }
+
+    public function storeReceipt(?UploadedFile $file): ?string
+    {
+        if (!$file || !$file->isValid()) {
+            return null;
+        }
+
+        if (($file->getSize() ?? 0) <= 0) {
+            return null;
+        }
+
+        $dir = $this->ensureUploadDir();
+        $extension = $file->getClientOriginalExtension();
+        $extension = $extension !== '' ? '.' . strtolower($extension) : '';
+        $filename = 'reimb_' . date('Ymd_His') . '_' . Str::random(8) . $extension;
+
+        if (!$file->move($dir, $filename)) {
+            throw new RuntimeException('Unable to save uploaded file.');
+        }
+
+        return $filename;
+    }
+
+    public function storeAdminFile(int $batchId, int $adminId, UploadedFile $file, int $userId): array
+    {
+        $dir = $this->ensureUploadDir();
+        $extension = $file->getClientOriginalExtension();
+        $extension = $extension !== '' ? '.' . strtolower($extension) : '';
+        $filename = 'batch_check_' . date('Ymd_His') . '_' . Str::random(8) . $extension;
+
+        if (!$file->move($dir, $filename)) {
+            throw new RuntimeException('Unable to save uploaded file.');
+        }
+
+        $existing = ReimbursementBatchAdminFile::query()
+            ->where('batch_id', $batchId)
+            ->where('admin_id', $adminId)
+            ->first();
+
+        if ($existing && !empty($existing->filename)) {
+            $oldPath = $dir . DIRECTORY_SEPARATOR . $existing->filename;
+            if (is_file($oldPath)) {
+                @unlink($oldPath);
+            }
+        }
+
+        $payload = [
+            'batch_id' => $batchId,
+            'admin_id' => $adminId,
+            'filename' => $filename,
+            'original_filename' => $file->getClientOriginalName(),
+            'uploaded_at' => now(),
+            'uploaded_by' => $userId ?: null,
+        ];
+
+        if ($existing) {
+            $existing->fill($payload);
+            $existing->save();
+        } else {
+            ReimbursementBatchAdminFile::query()->create($payload);
+        }
+
+        return [
+            'filename' => $filename,
+            'original_filename' => $file->getClientOriginalName(),
+            'url' => $this->adminFileUrl($filename, 'inline'),
+        ];
+    }
+
+    private function ensureUploadDir(): string
+    {
+        $dir = storage_path('uploads/reimbursements');
+
+        if (!is_dir($dir)) {
+            if (!@mkdir($dir, 0755, true) && !is_dir($dir)) {
+                throw new RuntimeException('Upload directory is not available.');
+            }
+        }
+
+        if (!is_writable($dir)) {
+            throw new RuntimeException('Upload directory is not writable.');
+        }
+
+        return $dir;
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementLookupService.php b/app/Services/Reimbursements/ReimbursementLookupService.php
new file mode 100644
index 00000000..604120ad
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementLookupService.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\Reimbursement;
+
+class ReimbursementLookupService
+{
+    public function findReimbursementIdForExpense(int $expenseId): ?int
+    {
+        if ($expenseId <= 0) {
+            return null;
+        }
+
+        $row = Reimbursement::query()
+            ->select('id')
+            ->where('expense_id', $expenseId)
+            ->orderByDesc('id')
+            ->first();
+
+        return $row ? (int) $row->id : null;
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementQueryService.php b/app/Services/Reimbursements/ReimbursementQueryService.php
new file mode 100644
index 00000000..66b2d40f
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementQueryService.php
@@ -0,0 +1,498 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use App\Models\Expense;
+use App\Models\ReimbursementBatchAdminFile;
+use Illuminate\Support\Facades\DB;
+
+class ReimbursementQueryService
+{
+    public function __construct(
+        private ReimbursementRecipientService $recipients,
+        private ReimbursementFileService $files
+    ) {
+    }
+
+    public function underProcessing(): array
+    {
+        $pendingQuery = DB::table('expenses as e')
+            ->selectRaw('e.id as expense_id, e.amount as expense_amount, e.description, e.receipt_path as expense_receipt, e.retailor, e.purchased_by, u.firstname as purchaser_firstname, u.lastname as purchaser_lastname')
+            ->leftJoin('users as u', 'u.id', '=', 'e.purchased_by')
+            ->leftJoin('reimbursement_batch_items as bi', function ($join) {
+                $join->on('bi.expense_id', '=', 'e.id');
+                $join->whereNull('bi.unassigned_at');
+            })
+            ->whereNull('e.reimbursement_id')
+            ->where('e.category', '!=', 'Donation')
+            ->where(function ($q) {
+                $q->where('e.status', 'approved')
+                    ->orWhere('e.status', 'Approved')
+                    ->orWhere('e.status', 'APPROVED');
+            })
+            ->whereNull('bi.id')
+            ->orderByDesc('e.created_at');
+
+        $pendingRows = $pendingQuery->get();
+
+        $pendingItems = [];
+        $itemsMap = [];
+
+        foreach ($pendingRows as $row) {
+            $expenseId = (int) ($row->expense_id ?? 0);
+            if ($expenseId <= 0) {
+                continue;
+            }
+
+            $receiptUrl = $this->files->expenseReceiptUrl($row->expense_receipt ?? null);
+            $fullName = trim(($row->purchaser_firstname ?? '') . ' ' . ($row->purchaser_lastname ?? '')) ?: 'Unknown';
+
+            $item = [
+                'id' => $expenseId,
+                'expense_id' => $expenseId,
+                'reimbursement_id' => null,
+                'expense_amount' => (float) ($row->expense_amount ?? 0),
+                'vendor' => (string) ($row->retailor ?? ''),
+                'description' => trim((string) ($row->description ?? '')),
+                'purchased_by' => $fullName,
+                'receipt_url' => $receiptUrl,
+                'batch_id' => null,
+                'batch_label' => null,
+                'admin_id' => null,
+                'admin_name' => null,
+                'batch_number' => 0,
+            ];
+
+            $pendingItems[] = $item;
+            $itemsMap[$expenseId] = $item;
+        }
+
+        $assignedQuery = DB::table('reimbursement_batch_items as bi')
+            ->selectRaw('bi.id as batch_item_id, bi.batch_id, bi.admin_id, bi.reimbursement_id, bi.expense_id, b.title as batch_title, b.status as batch_status, b.yearly_batch_number as batch_year_number, e.amount as expense_amount, e.description, e.receipt_path as expense_receipt, e.retailor, purchaser.firstname as purchaser_firstname, purchaser.lastname as purchaser_lastname, admin.firstname as admin_firstname, admin.lastname as admin_lastname')
+            ->join('reimbursement_batches as b', 'b.id', '=', 'bi.batch_id')
+            ->join('expenses as e', 'e.id', '=', 'bi.expense_id')
+            ->leftJoin('users as purchaser', 'purchaser.id', '=', 'e.purchased_by')
+            ->leftJoin('users as admin', 'admin.id', '=', 'bi.admin_id')
+            ->where('b.status', 'open')
+            ->whereNull('bi.unassigned_at')
+            ->whereNull('e.reimbursement_id')
+            ->where('e.category', '!=', 'Donation')
+            ->where(function ($q) {
+                $q->where('e.status', 'approved')
+                    ->orWhere('e.status', 'Approved')
+                    ->orWhere('e.status', 'APPROVED');
+            })
+            ->orderBy('b.opened_at', 'ASC')
+            ->orderBy('bi.assigned_at', 'ASC');
+
+        $assignedRows = $assignedQuery->get();
+        $batchStructures = [];
+
+        foreach ($assignedRows as $row) {
+            $expenseId = (int) ($row->expense_id ?? 0);
+            $batchId = (int) ($row->batch_id ?? 0);
+            if ($expenseId <= 0 || $batchId <= 0) {
+                continue;
+            }
+
+            $receiptUrl = $this->files->expenseReceiptUrl($row->expense_receipt ?? null);
+            $purchaser = trim(($row->purchaser_firstname ?? '') . ' ' . ($row->purchaser_lastname ?? '')) ?: 'Unknown';
+            $yearlyNumber = (int) ($row->batch_year_number ?? 0);
+            $batchLabel = trim((string) ($row->batch_title ?? ''));
+            if ($batchLabel === '') {
+                $fallbackNumber = $yearlyNumber > 0 ? $yearlyNumber : $batchId;
+                $batchLabel = 'Batch #' . $fallbackNumber;
+            }
+            $adminId = $row->admin_id ? (int) $row->admin_id : 0;
+            $adminName = $adminId > 0
+                ? (trim(($row->admin_firstname ?? '') . ' ' . ($row->admin_lastname ?? '')) ?: 'Admin')
+                : 'Unassigned';
+            $batchStatus = strtolower(trim((string) ($row->batch_status ?? ''))) ?: 'open';
+
+            $item = [
+                'id' => $expenseId,
+                'expense_id' => $expenseId,
+                'reimbursement_id' => $row->reimbursement_id ? (int) $row->reimbursement_id : null,
+                'expense_amount' => (float) ($row->expense_amount ?? 0),
+                'vendor' => (string) ($row->retailor ?? ''),
+                'description' => trim((string) ($row->description ?? '')),
+                'purchased_by' => $purchaser,
+                'receipt_url' => $receiptUrl,
+                'batch_id' => $batchId,
+                'batch_label' => $batchLabel,
+                'admin_id' => $adminId ?: null,
+                'admin_name' => $adminId > 0 ? $adminName : null,
+                'batch_number' => $batchId,
+            ];
+
+            $itemsMap[$expenseId] = $item;
+
+            if (!isset($batchStructures[$batchId])) {
+                $batchStructures[$batchId] = [
+                    'batchId' => $batchId,
+                    'label' => $batchLabel,
+                    'slots' => [],
+                    'status' => $batchStatus,
+                    'yearly_batch_number' => $yearlyNumber,
+                ];
+            } else {
+                $batchStructures[$batchId]['status'] = $batchStatus;
+                if ($yearlyNumber > 0) {
+                    $batchStructures[$batchId]['yearly_batch_number'] = $yearlyNumber;
+                }
+            }
+
+            $slotKey = $adminId ?: 0;
+            if (!isset($batchStructures[$batchId]['slots'][$slotKey])) {
+                $batchStructures[$batchId]['slots'][$slotKey] = [
+                    'admin_id' => $adminId ?: 0,
+                    'admin_name' => $adminId > 0 ? $adminName : 'Unassigned',
+                    'items' => [],
+                    'check_file' => null,
+                ];
+            }
+            $batchStructures[$batchId]['slots'][$slotKey]['items'][] = $expenseId;
+        }
+
+        $adminFileMap = [];
+        if (!empty($batchStructures)) {
+            $batchIds = array_keys($batchStructures);
+            $files = ReimbursementBatchAdminFile::query()
+                ->select('batch_id', 'admin_id', 'filename', 'original_filename')
+                ->whereIn('batch_id', $batchIds)
+                ->get();
+
+            foreach ($files as $file) {
+                $batchId = (int) ($file->batch_id ?? 0);
+                $adminId = (int) ($file->admin_id ?? 0);
+                if ($batchId <= 0) {
+                    continue;
+                }
+                $adminFileMap[$batchId][$adminId] = [
+                    'filename' => $file->filename,
+                    'original_filename' => $file->original_filename ?? null,
+                    'url' => $this->files->adminFileUrl($file->filename ?? '', 'inline'),
+                ];
+            }
+        }
+
+        foreach ($batchStructures as $batchId => &$batch) {
+            foreach ($batch['slots'] as $slotKey => &$slot) {
+                $adminId = $slot['admin_id'] ?? 0;
+                $slot['check_file'] = $adminFileMap[$batchId][$adminId] ?? null;
+            }
+            unset($slot);
+        }
+        unset($batch);
+
+        $existingBatches = array_map(static function (array $batch) {
+            $normalizedSlots = array_map(static function (array $slot) {
+                $slot['items'] = array_values(array_map('intval', $slot['items']));
+                return $slot;
+            }, array_values($batch['slots']));
+
+            $itemIds = [];
+            foreach ($normalizedSlots as $slot) {
+                $itemIds = array_merge($itemIds, $slot['items']);
+            }
+
+            return [
+                'batchId' => $batch['batchId'],
+                'batchNumber' => $batch['batchId'],
+                'label' => $batch['label'],
+                'sequence' => $batch['yearly_batch_number'] ?? 0,
+                'yearly_batch_number' => $batch['yearly_batch_number'] ?? 0,
+                'slots' => $normalizedSlots,
+                'itemIds' => array_values(array_unique($itemIds)),
+                'status' => $batch['status'] ?? 'open',
+            ];
+        }, array_values($batchStructures));
+
+        $admins = $this->recipients->adminRoster();
+
+        return [
+            'pendingItems' => $pendingItems,
+            'existingBatches' => $existingBatches,
+            'adminUsers' => $admins,
+            'itemsPayload' => array_values($itemsMap),
+        ];
+    }
+
+    public function index(array $filters): array
+    {
+        $expenses = Expense::getReimbursedExpensesWithDetails($filters)
+            ->get()
+            ->map(static fn ($row) => (array) $row)
+            ->all();
+
+        $batchSummaries = [];
+        $batchDetails = [];
+        $batchAttachments = [];
+
+        $batchQuery = DB::table('reimbursement_batches as b')
+            ->selectRaw('b.id as batch_id, b.title as batch_title, b.yearly_batch_number, b.closed_at, b.school_year as batch_school_year, e.id as expense_id, e.amount as expense_amount, e.description, e.retailor, e.receipt_path as expense_receipt, e.date_of_purchase as expense_date_of_purchase, e.purchased_by, u.firstname as purchaser_firstname, u.lastname as purchaser_lastname, r.amount as reimb_amount')
+            ->join('reimbursement_batch_items as bi', 'bi.batch_id', '=', 'b.id')
+            ->join('expenses as e', 'e.id', '=', 'bi.expense_id')
+            ->leftJoin('users as u', 'u.id', '=', 'e.purchased_by')
+            ->leftJoin('reimbursements as r', 'r.expense_id', '=', 'e.id')
+            ->where('b.status', 'closed')
+            ->whereNull('bi.unassigned_at');
+
+        if (!empty($filters['school_year'])) {
+            $batchQuery->where(function ($q) use ($filters) {
+                $q->where('b.school_year', $filters['school_year'])
+                    ->orWhere('e.school_year', $filters['school_year']);
+            });
+        }
+        if (!empty($filters['user_id'])) {
+            $batchQuery->where('e.purchased_by', $filters['user_id']);
+        }
+
+        $batchRows = $batchQuery->get();
+        foreach ($batchRows as $row) {
+            $bid = (int) ($row->batch_id ?? 0);
+            if ($bid <= 0) {
+                continue;
+            }
+            $labelNumber = (int) ($row->yearly_batch_number ?? $bid);
+            if (!isset($batchSummaries[$bid])) {
+                $batchSummaries[$bid] = [
+                    'batch_id' => $bid,
+                    'title' => trim((string) ($row->batch_title ?? '')) ?: ('Batch #' . $labelNumber),
+                    'sequence' => $labelNumber,
+                    'closed_at' => $row->closed_at ?? null,
+                    'amount' => 0.0,
+                    'items' => 0,
+                ];
+            }
+            $amount = $row->reimb_amount ?? $row->expense_amount ?? 0;
+            $batchSummaries[$bid]['amount'] += (float) $amount;
+            $batchSummaries[$bid]['items'] += 1;
+
+            if (!isset($batchDetails[$bid])) {
+                $batchDetails[$bid] = [
+                    'title' => $batchSummaries[$bid]['title'],
+                    'sequence' => $labelNumber,
+                    'closed_at' => $batchSummaries[$bid]['closed_at'],
+                    'items' => [],
+                    'checks' => [],
+                ];
+            }
+            if (!isset($batchAttachments[$bid])) {
+                $batchAttachments[$bid] = [
+                    'receipts' => [],
+                    'checks' => [],
+                ];
+            }
+
+            $batchDetails[$bid]['items'][] = [
+                'amount' => (float) $amount,
+                'description' => $row->description ?? '',
+                'vendor' => $row->retailor ?? '',
+                'purchased_by' => trim(($row->purchaser_firstname ?? '') . ' ' . ($row->purchaser_lastname ?? '')),
+                'receipt_url' => $this->files->expenseReceiptUrl($row->expense_receipt ?? null),
+            ];
+
+            $receiptFilename = trim((string) ($row->expense_receipt ?? ''));
+            if ($receiptFilename !== '') {
+                $batchAttachments[$bid]['receipts'][] = [
+                    'expense_id' => (int) ($row->expense_id ?? 0),
+                    'receipt_filename' => $receiptFilename,
+                    'receipt_url' => $this->files->expenseReceiptUrl($receiptFilename),
+                    'purchaser_firstname' => $row->purchaser_firstname ?? '',
+                    'purchaser_lastname' => $row->purchaser_lastname ?? '',
+                    'vendor' => $row->retailor ?? '',
+                    'description' => $row->description ?? '',
+                    'amount' => (float) ($row->expense_amount ?? 0),
+                    'date_of_purchase' => $row->expense_date_of_purchase ?? '',
+                ];
+            }
+        }
+
+        if (!empty($batchSummaries)) {
+            $batchIds = array_keys($batchSummaries);
+            $files = ReimbursementBatchAdminFile::query()
+                ->select('id as file_id', 'batch_id', 'admin_id', 'filename', 'original_filename', 'uploaded_at')
+                ->whereIn('batch_id', $batchIds)
+                ->get();
+
+            $adminNames = $this->recipients->adminRoster();
+            $adminNameMap = [];
+            foreach ($adminNames as $admin) {
+                $adminNameMap[(int) $admin['id']] = trim(($admin['firstname'] ?? '') . ' ' . ($admin['lastname'] ?? ''));
+            }
+
+            foreach ($files as $file) {
+                $bid = (int) ($file->batch_id ?? 0);
+                if ($bid <= 0 || !isset($batchDetails[$bid])) {
+                    continue;
+                }
+                $aid = (int) ($file->admin_id ?? 0);
+                $batchDetails[$bid]['checks'][] = [
+                    'admin' => $adminNameMap[$aid] ?? ($aid > 0 ? 'Admin #' . $aid : 'Unassigned'),
+                    'filename' => $file->filename,
+                    'original' => $file->original_filename ?? $file->filename,
+                    'url' => $this->files->adminFileUrl($file->filename ?? '', 'inline'),
+                ];
+                if (!isset($batchAttachments[$bid])) {
+                    $batchAttachments[$bid] = [
+                        'receipts' => [],
+                        'checks' => [],
+                    ];
+                }
+                $batchAttachments[$bid]['checks'][] = [
+                    'file_id' => (int) ($file->file_id ?? 0),
+                    'filename' => $file->filename,
+                    'original_filename' => $file->original_filename ?? $file->filename,
+                    'admin' => $adminNameMap[$aid] ?? ($aid > 0 ? 'Admin #' . $aid : 'Unassigned'),
+                    'url' => $this->files->adminFileUrl($file->filename ?? '', 'inline'),
+                    'uploaded_at' => $file->uploaded_at ?? null,
+                ];
+            }
+        }
+
+        if (!empty($batchSummaries)) {
+            $batchSummaries = array_values($batchSummaries);
+            usort($batchSummaries, static function ($a, $b) {
+                $aSeq = (int) ($a['sequence'] ?? 0);
+                $bSeq = (int) ($b['sequence'] ?? 0);
+                return $bSeq <=> $aSeq;
+            });
+        }
+
+        $donationBatch = null;
+        $donationDetails = [
+            'items' => [],
+            'checks' => [],
+        ];
+
+        $donationQuery = DB::table('expenses as e')
+            ->selectRaw('e.id as expense_id, e.amount as expense_amount, e.description, e.retailor, e.receipt_path as expense_receipt, e.purchased_by, e.school_year, e.semester, e.status, u.firstname as purchaser_firstname, u.lastname as purchaser_lastname')
+            ->leftJoin('users as u', 'u.id', '=', 'e.purchased_by')
+            ->where('e.category', 'Donation');
+
+        if (!empty($filters['school_year'])) {
+            $donationQuery->where('e.school_year', $filters['school_year']);
+        }
+        if (!empty($filters['semester'])) {
+            $donationQuery->where('e.semester', $filters['semester']);
+        }
+        if (!empty($filters['user_id'])) {
+            $donationQuery->where('e.purchased_by', $filters['user_id']);
+        }
+        if (!empty($filters['status'])) {
+            $donationQuery->where(function ($q) use ($filters) {
+                $q->where('e.status', $filters['status'])
+                    ->orWhere('e.status', strtolower((string) $filters['status']))
+                    ->orWhere('e.status', strtoupper((string) $filters['status']));
+            });
+        }
+
+        $donationRows = $donationQuery->orderByDesc('e.created_at')->get();
+        if ($donationRows->isNotEmpty()) {
+            $donationTotal = 0.0;
+            foreach ($donationRows as $row) {
+                $amount = (float) ($row->expense_amount ?? 0);
+                $donationTotal += $amount;
+                $purchaser = trim(($row->purchaser_firstname ?? '') . ' ' . ($row->purchaser_lastname ?? ''));
+                if ($purchaser === '') {
+                    $purchaser = 'Unknown';
+                }
+                $donationDetails['items'][] = [
+                    'amount' => $amount,
+                    'description' => $row->description ?? '',
+                    'vendor' => $row->retailor ?? '',
+                    'purchased_by' => $purchaser,
+                    'receipt_url' => $this->files->expenseReceiptUrl($row->expense_receipt ?? null),
+                ];
+            }
+
+            $donationBatch = [
+                'title' => 'Donations',
+                'items' => count($donationDetails['items']),
+                'amount' => $donationTotal,
+            ];
+        }
+
+        foreach ($expenses as &$e) {
+            if (array_key_exists('expense_receipt', $e)) {
+                $e['expense_receipt_url'] = $this->files->expenseReceiptUrl($e['expense_receipt']);
+            } elseif (array_key_exists('receipt_path', $e)) {
+                $e['expense_receipt_url'] = $this->files->expenseReceiptUrl($e['receipt_path']);
+            }
+
+            if (array_key_exists('reimb_receipt', $e)) {
+                $e['reimb_receipt_url'] = $this->files->receiptUrl($e['reimb_receipt']);
+            } elseif (array_key_exists('receipt_path_reimb', $e)) {
+                $e['reimb_receipt_url'] = $this->files->receiptUrl($e['receipt_path_reimb']);
+            }
+
+            $recipientId = $e['reimb_recipient_id'] ?? ($e['reimbursed_to'] ?? null);
+            $hasName = trim(($e['reimb_firstname'] ?? '') . ' ' . ($e['reimb_lastname'] ?? '')) !== '';
+            if (!$hasName) {
+                $label = $this->recipients->specialRecipientLabel($recipientId);
+                if ($label !== null) {
+                    $e['reimb_firstname'] = $label;
+                    $e['reimb_lastname'] = '';
+                }
+            }
+        }
+        unset($e);
+
+        $users = $this->recipients->recipientOptions();
+
+        $years = DB::table('reimbursements')
+            ->select('school_year')
+            ->distinct()
+            ->orderByDesc('school_year')
+            ->get();
+        $schoolYears = array_values(array_filter(array_map(static fn ($row) => $row->school_year ?? null, $years->all())));
+
+        return [
+            'expenses' => $expenses,
+            'users' => $users,
+            'schoolYears' => $schoolYears,
+            'batchSummaries' => $batchSummaries,
+            'batchDetails' => $batchDetails,
+            'batchAttachments' => $batchAttachments,
+            'donationBatch' => $donationBatch,
+            'donationDetails' => $donationDetails,
+        ];
+    }
+
+    public function reimbursedExpenses(): array
+    {
+        $rows = DB::table('reimbursements as r')
+            ->selectRaw('e.amount as expense_amount, e.category, e.description, e.receipt_path as expense_receipt, e.purchased_by, r.amount as reimb_amount, r.reimbursement_method, r.check_number, r.receipt_path as reimb_receipt, r.status as reimb_status, r.created_at, u.firstname as purchaser_firstname, u.lastname as purchaser_lastname, a.firstname as approver_firstname, a.lastname as approver_lastname')
+            ->join('expenses as e', 'e.id', '=', 'r.expense_id')
+            ->leftJoin('users as u', 'u.id', '=', 'e.purchased_by')
+            ->leftJoin('users as a', 'a.id', '=', 'r.approved_by')
+            ->orderByDesc('r.created_at')
+            ->get();
+
+        $expenses = [];
+        foreach ($rows as $row) {
+            $expenses[] = [
+                'expense_amount' => (float) ($row->expense_amount ?? 0),
+                'category' => $row->category ?? null,
+                'description' => $row->description ?? null,
+                'expense_receipt' => $row->expense_receipt ?? null,
+                'purchased_by' => $row->purchased_by ?? null,
+                'reimb_amount' => (float) ($row->reimb_amount ?? 0),
+                'reimbursement_method' => $row->reimbursement_method ?? null,
+                'check_number' => $row->check_number ?? null,
+                'reimb_receipt' => $row->reimb_receipt ?? null,
+                'reimb_status' => $row->reimb_status ?? null,
+                'created_at' => $row->created_at ?? null,
+                'purchaser_firstname' => $row->purchaser_firstname ?? null,
+                'purchaser_lastname' => $row->purchaser_lastname ?? null,
+                'approver_firstname' => $row->approver_firstname ?? null,
+                'approver_lastname' => $row->approver_lastname ?? null,
+                'expense_receipt_url' => $this->files->expenseReceiptUrl($row->expense_receipt ?? null),
+                'reimb_receipt_url' => $this->files->receiptUrl($row->reimb_receipt ?? null),
+            ];
+        }
+
+        return $expenses;
+    }
+}
diff --git a/app/Services/Reimbursements/ReimbursementRecipientService.php b/app/Services/Reimbursements/ReimbursementRecipientService.php
new file mode 100644
index 00000000..d614b514
--- /dev/null
+++ b/app/Services/Reimbursements/ReimbursementRecipientService.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Services\Reimbursements;
+
+use Illuminate\Support\Facades\DB;
+
+class ReimbursementRecipientService
+{
+    public const SPECIAL_RECIPIENTS = [
+        990001 => 'Masjid',
+        990002 => 'Donation',
+    ];
+
+    public function staffUsers(): array
+    {
+        $rows = DB::table('users')
+            ->select('users.id', 'users.firstname', 'users.lastname', 'roles.name as role_name')
+            ->leftJoin('user_roles', 'user_roles.user_id', '=', 'users.id')
+            ->leftJoin('roles', 'roles.id', '=', 'user_roles.role_id')
+            ->whereNotNull('roles.name')
+            ->get();
+
+        $excludedRoles = array_map('strtolower', ['parent', 'student', 'guest']);
+        $staff = [];
+
+        foreach ($rows as $row) {
+            $roleName = strtolower((string) ($row->role_name ?? ''));
+            $id = (int) ($row->id ?? 0);
+            if ($id <= 0 || in_array($roleName, $excludedRoles, true)) {
+                continue;
+            }
+            if (!isset($staff[$id])) {
+                $staff[$id] = [
+                    'id' => $id,
+                    'firstname' => $row->firstname ?? '',
+                    'lastname' => $row->lastname ?? '',
+                ];
+            }
+        }
+
+        uasort($staff, static function (array $a, array $b) {
+            $nameA = trim(($a['firstname'] ?? '') . ' ' . ($a['lastname'] ?? ''));
+            $nameB = trim(($b['firstname'] ?? '') . ' ' . ($b['lastname'] ?? ''));
+            return strcasecmp($nameA, $nameB);
+        });
+
+        return array_values($staff);
+    }
+
+    public function recipientOptions(): array
+    {
+        return $this->appendSpecialRecipients($this->staffUsers());
+    }
+
+    public function adminRoster(): array
+    {
+        $admins = $this->staffUsers();
+        if (!empty($admins)) {
+            return $admins;
+        }
+
+        return $this->recipientOptions();
+    }
+
+    public function specialRecipientLabel($value): ?string
+    {
+        if ($value === null || !is_numeric($value)) {
+            return null;
+        }
+
+        $id = (int) $value;
+        return self::SPECIAL_RECIPIENTS[$id] ?? null;
+    }
+
+    private function appendSpecialRecipients(array $users): array
+    {
+        $existingIds = array_map(static function ($row) {
+            return isset($row['id']) && is_numeric($row['id']) ? (int) $row['id'] : null;
+        }, $users);
+
+        foreach (self::SPECIAL_RECIPIENTS as $id => $label) {
+            if (!in_array($id, $existingIds, true)) {
+                $users[] = [
+                    'id' => $id,
+                    'firstname' => $label,
+                    'lastname' => '',
+                ];
+            }
+        }
+
+        return $users;
+    }
+}
diff --git a/app/Services/SchoolIdService.php b/app/Services/SchoolIdService.php
new file mode 100644
index 00000000..390f1233
--- /dev/null
+++ b/app/Services/SchoolIdService.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class SchoolIdService
+{
+    public function assignSchoolIdToUser(int $userId): ?string
+    {
+        $user = User::query()->find($userId);
+        if (!$user) {
+            return null;
+        }
+
+        $existing = (string) ($user->school_id ?? '');
+        if ($existing !== '') {
+            return $existing;
+        }
+
+        $schoolId = $this->generateUserSchoolId();
+        $user->school_id = $schoolId;
+        $user->save();
+
+        return $schoolId;
+    }
+
+    public function generateStudentSchoolId(): string
+    {
+        $year = date('y');
+        $maxId = 0;
+
+        $row = DB::table('students')
+            ->selectRaw('MAX(school_id) AS max_id')
+            ->where('school_id', 'like', "STU{$year}%")
+            ->first();
+
+        if (!empty($row?->max_id)) {
+            $numericPart = substr((string) $row->max_id, 5);
+            $maxId = (int) $numericPart;
+        }
+
+        $nextId = str_pad($maxId + 1, 5, '0', STR_PAD_LEFT);
+
+        return "STU{$year}{$nextId}";
+    }
+
+    public function generateUserSchoolId(): string
+    {
+        $year = date('y');
+        $maxId = 0;
+
+        $row = DB::table('users')
+            ->selectRaw('MAX(school_id) AS max_id')
+            ->where('school_id', 'not like', 'S%')
+            ->where('school_id', 'like', "{$year}%")
+            ->first();
+
+        if (!empty($row?->max_id)) {
+            $numericPart = substr((string) $row->max_id, 2);
+            $maxId = max($maxId, (int) $numericPart);
+        }
+
+        $nextId = str_pad($maxId + 1, 5, '0', STR_PAD_LEFT);
+
+        return "{$year}{$nextId}";
+    }
+}
diff --git a/app/Services/Scores/AttendanceCalculator.php b/app/Services/Scores/AttendanceCalculator.php
new file mode 100644
index 00000000..05579295
--- /dev/null
+++ b/app/Services/Scores/AttendanceCalculator.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Interfaces\ScoreCalculatorInterface;
+use App\Models\AttendanceRecord;
+use App\Models\CalendarEvent;
+use App\Models\Configuration;
+use RuntimeException;
+
+class AttendanceCalculator implements ScoreCalculatorInterface
+{
+    public function __construct(
+        private AttendanceRecord $attendanceModel,
+        private Configuration $configModel,
+        private CalendarEvent $calendarModel
+    ) {
+    }
+
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        $absences = AttendanceRecord::getTotalAbsences($studentId, $semester, $schoolYear);
+
+        $totalDays = null;
+        $normSemester = $this->normalizeSemester($semester);
+        if ($schoolYear !== '' && $normSemester !== '') {
+            $semRange = $this->getSemesterRange($schoolYear, $normSemester);
+            if ($semRange) {
+                try {
+                    $events = CalendarEvent::getEventsBySchoolYearAndSemester($schoolYear, $normSemester);
+                    $noSchoolSundays = 0;
+                    foreach ($events as $event) {
+                        if (!empty($event['no_school'])) {
+                            $date = new \DateTime($event['date']);
+                            if ($date->format('N') == 7) {
+                                if ($date->format('Y-m-d') >= $semRange[0] && $date->format('Y-m-d') <= $semRange[1]) {
+                                    $noSchoolSundays++;
+                                }
+                            }
+                        }
+                    }
+                    $totalDays = $this->countSundays($semRange[0], $semRange[1]) - $noSchoolSundays;
+                } catch (\Throwable $e) {
+                    $totalDays = null;
+                }
+            }
+        }
+
+        if ($totalDays === null) {
+            $totalDays = $this->getConfiguredSemesterLength($semester);
+        } else {
+            $configuredDays = $this->getConfiguredSemesterLength($semester);
+            if ($configuredDays !== null) {
+                $totalDays = $configuredDays;
+            }
+        }
+
+        if ($totalDays === null || $totalDays < 0) {
+            throw new RuntimeException("Invalid attendance data: could not determine total days for student {$studentId}.");
+        }
+
+        if ($totalDays == 0) {
+            return ['attendance_score' => 100.0];
+        }
+
+        $attendanceRatio = ($totalDays + 1 - $absences) / $totalDays;
+        $score = min(100, max(0, $attendanceRatio * 100));
+
+        return ['attendance_score' => round($score, 2)];
+    }
+
+    protected function normalizeSemester(?string $input): string
+    {
+        $s = strtolower(trim((string) $input));
+        if ($s === 'fall' || str_contains($s, '1')) return 'fall';
+        if ($s === 'spring' || str_contains($s, '2')) return 'spring';
+        return '';
+    }
+
+    protected function getSemesterRange(string $schoolYear, string $semester): ?array
+    {
+        $norm = $this->normalizeSemester($semester);
+        if ($norm === '' || !preg_match('/^(\d{4})-(\d{4})$/', trim($schoolYear), $m)) {
+            if ($norm === '' || !preg_match('/^(\d{4})/', trim($schoolYear), $m)) {
+                return null;
+            }
+            $y1 = (int) $m[1];
+            $y2 = $y1 + 1;
+        } else {
+            $y1 = (int) $m[1];
+            $y2 = (int) $m[2];
+        }
+
+        $fallStartCfg = (string) (Configuration::getConfig('fall_semester_start') ?? '');
+        $fallEndCfg = (string) (Configuration::getConfig('fall_end_date') ?? '');
+        $springStartCfg = (string) (Configuration::getConfig('spring_semester_start') ?? '');
+        $springEndCfg = (string) (Configuration::getConfig('last_school_day') ?? '');
+
+        if ($norm === 'fall') {
+            $start = ($fallStartCfg !== '') ? sprintf('%04d-%s', $y1, date('m-d', strtotime($fallStartCfg))) : "{$y1}-09-01";
+            $end = ($fallEndCfg !== '') ? sprintf('%04d-%s', $y2, date('m-d', strtotime($fallEndCfg))) : "{$y2}-01-15";
+            return [$start, $end];
+        }
+
+        if ($norm === 'spring') {
+            $start = ($springStartCfg !== '') ? sprintf('%04d-%s', $y2, date('m-d', strtotime($springStartCfg))) : "{$y2}-01-16";
+            $end = ($springEndCfg !== '') ? sprintf('%04d-%s', $y2, date('m-d', strtotime($springEndCfg))) : "{$y2}-06-30";
+            return [$start, $end];
+        }
+
+        return null;
+    }
+
+    private function countSundays(string $startDate, string $endDate): int
+    {
+        $start = new \DateTime($startDate);
+        $end = new \DateTime($endDate);
+        $sundays = 0;
+        $interval = new \DateInterval('P1D');
+        $period = new \DatePeriod($start, $interval, $end->modify('+1 day'));
+
+        foreach ($period as $day) {
+            if ($day->format('N') == 7) {
+                $sundays++;
+            }
+        }
+        return $sundays;
+    }
+
+    private function getConfiguredSemesterLength(string $semester): ?int
+    {
+        $norm = $this->normalizeSemester($semester);
+        if ($norm === '') {
+            return null;
+        }
+
+        $configKey = $norm === 'fall' ? 'total_semester1_days' : 'total_semester2_days';
+        $value = Configuration::getConfig($configKey);
+        if (!is_numeric($value)) {
+            return null;
+        }
+
+        $length = (int) $value;
+        return $length > 0 ? $length : null;
+    }
+}
diff --git a/app/Services/Scores/ExamScoreService.php b/app/Services/Scores/ExamScoreService.php
new file mode 100644
index 00000000..06d7d2e4
--- /dev/null
+++ b/app/Services/Scores/ExamScoreService.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\GradingLock;
+use App\Models\MissingScoreOverride;
+use App\Models\Student;
+use Illuminate\Support\Facades\DB;
+
+class ExamScoreService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function list(string $table, int $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $semester = $this->term->semesterLabel($semester);
+        $schoolYear = $this->term->schoolYear($schoolYear);
+
+        $latestSub = DB::table($table)
+            ->select('student_id', DB::raw('MAX(id) AS max_id'))
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->groupBy('student_id');
+
+        $rows = DB::table('students as s')
+            ->select([
+                's.id as student_id',
+                's.school_id',
+                's.firstname',
+                's.lastname',
+                'ex.score',
+            ])
+            ->join('student_class as sc', function ($join) use ($classSectionId, $schoolYear) {
+                $join->on('sc.student_id', '=', 's.id')
+                    ->where('sc.class_section_id', '=', $classSectionId)
+                    ->where('sc.school_year', '=', $schoolYear);
+            })
+            ->leftJoinSub($latestSub, 'latest', 'latest.student_id', '=', 's.id')
+            ->leftJoin($table . ' as ex', 'ex.id', '=', 'latest.max_id')
+            ->orderBy('s.lastname')
+            ->orderBy('s.firstname')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        return [
+            'students' => $rows,
+            'semester' => $semester,
+            'schoolYear' => $schoolYear,
+            'scoresLocked' => GradingLock::isLocked($classSectionId, $semester, $schoolYear),
+            'missingOkMap' => MissingScoreOverride::getOverridesMap(
+                $classSectionId,
+                $semester,
+                $schoolYear,
+                $table === 'midterm_exam' ? 'midterm_exam' : 'final_exam'
+            ),
+        ];
+    }
+
+    public function update(string $table, int $classSectionId, string $semester, string $schoolYear, array $scores, array $missingOk, int $updatedBy): int
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_keys($scores);
+        $checkedItems = [];
+        foreach ($missingOk as $studentId => $flags) {
+            $checkedItems[] = [
+                'student_id' => (int) $studentId,
+                'item_index' => null,
+            ];
+        }
+
+        MissingScoreOverride::replaceOverrides(
+            $classSectionId,
+            $semester,
+            $schoolYear,
+            $table === 'midterm_exam' ? 'midterm_exam' : 'final_exam',
+            $studentIds,
+            null,
+            $checkedItems,
+            $updatedBy,
+            true
+        );
+
+        $builder = DB::table($table);
+        $count = 0;
+
+        foreach ($scores as $studentId => $data) {
+            if (!is_numeric($studentId)) {
+                continue;
+            }
+            $rawScore = $data['score'] ?? null;
+            $normalizedScore = is_numeric($rawScore) ? (float) $rawScore : null;
+
+            $existing = $builder
+                ->where('student_id', $studentId)
+                ->where('class_section_id', $classSectionId)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->first();
+
+            $payload = [
+                'student_id' => (int) $studentId,
+                'class_section_id' => $classSectionId,
+                'updated_by' => $updatedBy,
+                'score' => $normalizedScore,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'updated_at' => now(),
+            ];
+
+            if ($existing) {
+                $builder->where('id', $existing->id)->update($payload);
+            } else {
+                $payload['created_at'] = now();
+                $builder->insert($payload);
+            }
+
+            $count++;
+        }
+
+        return $count;
+    }
+}
diff --git a/app/Services/Scores/HomeworkCalculator.php b/app/Services/Scores/HomeworkCalculator.php
new file mode 100644
index 00000000..96a63d1d
--- /dev/null
+++ b/app/Services/Scores/HomeworkCalculator.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Interfaces\ScoreCalculatorInterface;
+use App\Models\Homework;
+
+class HomeworkCalculator implements ScoreCalculatorInterface
+{
+    public function __construct(private Homework $homeworkModel)
+    {
+    }
+
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        $average = Homework::getAverageHomeworkScore($studentId, $semester, $schoolYear, $classSectionId);
+        return ['homework_avg' => $average !== null ? (float) $average : null];
+    }
+}
diff --git a/app/Services/Scores/HomeworkScoreService.php b/app/Services/Scores/HomeworkScoreService.php
new file mode 100644
index 00000000..36590fd8
--- /dev/null
+++ b/app/Services/Scores/HomeworkScoreService.php
@@ -0,0 +1,226 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\GradingLock;
+use App\Models\Homework;
+use App\Models\MissingScoreOverride;
+use App\Models\Student;
+use App\Models\StudentClass;
+
+class HomeworkScoreService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function list(int $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $semester = $this->term->semesterLabel($semester);
+        $schoolYear = $this->term->schoolYear($schoolYear);
+        $semVariants = $this->term->semesterVariants($semester);
+
+        $headerRows = Homework::query()
+            ->select('homework_index')
+            ->where('class_section_id', $classSectionId)
+            ->whereIn('semester', $semVariants)
+            ->where('school_year', $schoolYear)
+            ->orderBy('homework_index')
+            ->get();
+
+        $headers = $headerRows->pluck('homework_index')->map(fn ($v) => (int) $v)->unique()->values()->all();
+
+        $studentIds = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->pluck('student_id')
+            ->map(fn ($v) => (int) $v)
+            ->all();
+
+        $students = Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('is_active', 1)
+            ->orderBy('lastname')
+            ->orderBy('firstname')
+            ->get()
+            ->map(fn ($row) => [
+                'student_id' => (int) $row->id,
+                'firstname' => (string) $row->firstname,
+                'lastname' => (string) $row->lastname,
+                'scores' => [],
+            ])
+            ->all();
+
+        $scoresRows = Homework::query()
+            ->select('student_id', 'homework_index', 'score')
+            ->where('class_section_id', $classSectionId)
+            ->whereIn('semester', $semVariants)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $scoresMap = [];
+        foreach ($scoresRows as $row) {
+            $scoresMap[(int) $row['student_id']][(int) $row['homework_index']] = $row['score'];
+        }
+
+        foreach ($students as &$student) {
+            foreach ($headers as $index) {
+                $student['scores'][(int) $index] = $scoresMap[$student['student_id']][$index] ?? '';
+            }
+        }
+        unset($student);
+
+        return [
+            'students' => $students,
+            'headers' => $headers,
+            'semester' => $semester,
+            'schoolYear' => $schoolYear,
+            'scoresLocked' => GradingLock::isLocked($classSectionId, $semester, $schoolYear),
+            'missingOkMap' => MissingScoreOverride::getOverridesMap($classSectionId, $semester, $schoolYear, 'homework'),
+        ];
+    }
+
+    public function update(int $classSectionId, string $semester, string $schoolYear, array $scores, array $missingOk, int $updatedBy): int
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_keys($scores);
+        $indexSet = [];
+        foreach ($scores as $hwData) {
+            if (!is_array($hwData)) {
+                continue;
+            }
+            foreach ($hwData as $index => $_) {
+                if (is_numeric($index)) {
+                    $indexSet[(int) $index] = true;
+                }
+            }
+        }
+
+        $checkedItems = [];
+        foreach ($missingOk as $studentId => $indexes) {
+            if (!is_array($indexes)) {
+                continue;
+            }
+            foreach ($indexes as $index => $flag) {
+                if (!is_numeric($index)) {
+                    continue;
+                }
+                $checkedItems[] = [
+                    'student_id' => (int) $studentId,
+                    'item_index' => (int) $index,
+                ];
+            }
+        }
+
+        MissingScoreOverride::replaceOverrides(
+            $classSectionId,
+            $semester,
+            $schoolYear,
+            'homework',
+            $studentIds,
+            array_keys($indexSet),
+            $checkedItems,
+            $updatedBy
+        );
+
+        $count = 0;
+        foreach ($scores as $studentId => $hwData) {
+            if (!is_numeric($studentId) || !is_array($hwData)) {
+                continue;
+            }
+            $student = Student::query()->find((int) $studentId);
+            if (!$student) {
+                continue;
+            }
+
+            foreach ($hwData as $index => $score) {
+                if (!is_numeric($index)) {
+                    continue;
+                }
+                $rawScore = $score ?? null;
+                $isBlank = $rawScore === null || (is_string($rawScore) && trim($rawScore) === '');
+                $normalizedScore = (!$isBlank && is_numeric($rawScore)) ? (float) $rawScore : null;
+
+                $existing = Homework::query()
+                    ->where('student_id', $studentId)
+                    ->where('homework_index', $index)
+                    ->where('class_section_id', $classSectionId)
+                    ->where('semester', $semester)
+                    ->where('school_year', $schoolYear)
+                    ->first();
+
+                $payload = [
+                    'student_id' => (int) $studentId,
+                    'school_id' => $student->school_id ?? null,
+                    'class_section_id' => $classSectionId,
+                    'updated_by' => $updatedBy,
+                    'homework_index' => (int) $index,
+                    'score' => $normalizedScore,
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                    'updated_at' => now(),
+                ];
+
+                if ($existing) {
+                    $existing->update($payload);
+                } else {
+                    $payload['created_at'] = now();
+                    Homework::query()->create($payload);
+                }
+                $count++;
+            }
+        }
+
+        return $count;
+    }
+
+    public function addColumn(int $classSectionId, string $semester, string $schoolYear, int $updatedBy): int
+    {
+        $semVariants = $this->term->semesterVariants($semester);
+        $maxIndex = (int) Homework::query()
+            ->where('class_section_id', $classSectionId)
+            ->whereIn('semester', $semVariants)
+            ->where('school_year', $schoolYear)
+            ->max('homework_index');
+
+        $nextIndex = $maxIndex + 1;
+
+        $students = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        foreach ($students as $student) {
+            $exists = Homework::query()
+                ->where('student_id', $student->student_id)
+                ->where('homework_index', $nextIndex)
+                ->where('class_section_id', $classSectionId)
+                ->whereIn('semester', $semVariants)
+                ->where('school_year', $schoolYear)
+                ->first();
+
+            if ($exists) {
+                continue;
+            }
+
+            Homework::query()->create([
+                'student_id' => (int) $student->student_id,
+                'class_section_id' => $classSectionId,
+                'updated_by' => $updatedBy,
+                'homework_index' => $nextIndex,
+                'score' => null,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+        }
+
+        return $nextIndex;
+    }
+}
diff --git a/app/Services/Scores/ParticipationScoreService.php b/app/Services/Scores/ParticipationScoreService.php
new file mode 100644
index 00000000..e474a15a
--- /dev/null
+++ b/app/Services/Scores/ParticipationScoreService.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\GradingLock;
+use App\Models\MissingScoreOverride;
+use App\Models\Participation;
+use App\Models\Student;
+use App\Models\StudentClass;
+
+class ParticipationScoreService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function list(int $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $semester = $this->term->semesterLabel($semester);
+        $schoolYear = $this->term->schoolYear($schoolYear);
+
+        $studentIds = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->pluck('student_id')
+            ->map(fn ($v) => (int) $v)
+            ->all();
+
+        $students = Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('is_active', 1)
+            ->orderBy('lastname')
+            ->orderBy('firstname')
+            ->get()
+            ->map(fn ($row) => [
+                'student_id' => (int) $row->id,
+                'school_id' => $row->school_id,
+                'firstname' => (string) $row->firstname,
+                'lastname' => (string) $row->lastname,
+                'scores' => [],
+            ])
+            ->all();
+
+        $scoresRows = Participation::query()
+            ->select('student_id', 'score')
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        $scoreMap = [];
+        foreach ($scoresRows as $row) {
+            $scoreMap[(int) $row->student_id] = $row->score;
+        }
+
+        foreach ($students as &$student) {
+            $student['scores'] = [
+                'score' => $scoreMap[$student['student_id']] ?? '',
+            ];
+        }
+        unset($student);
+
+        return [
+            'students' => $students,
+            'semester' => $semester,
+            'schoolYear' => $schoolYear,
+            'scoresLocked' => GradingLock::isLocked($classSectionId, $semester, $schoolYear),
+            'missingOkMap' => MissingScoreOverride::getOverridesMap($classSectionId, $semester, $schoolYear, 'participation'),
+        ];
+    }
+
+    public function update(int $classSectionId, string $semester, string $schoolYear, array $scores, array $missingOk, int $updatedBy): int
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_keys($scores);
+        $checkedItems = [];
+        foreach ($missingOk as $studentId => $flags) {
+            $checkedItems[] = [
+                'student_id' => (int) $studentId,
+                'item_index' => null,
+            ];
+        }
+
+        MissingScoreOverride::replaceOverrides(
+            $classSectionId,
+            $semester,
+            $schoolYear,
+            'participation',
+            $studentIds,
+            null,
+            $checkedItems,
+            $updatedBy,
+            true
+        );
+
+        $count = 0;
+        foreach ($scores as $studentId => $data) {
+            if (!is_numeric($studentId)) {
+                continue;
+            }
+            if (!is_array($data)) {
+                $data = ['score' => $data];
+            }
+
+            $student = Student::query()->find((int) $studentId);
+            if (!$student) {
+                continue;
+            }
+
+            $rawScore = $data['score'] ?? null;
+            $isBlank = $rawScore === null || (is_string($rawScore) && trim($rawScore) === '');
+            $normalizedScore = (!$isBlank && is_numeric($rawScore)) ? (float) $rawScore : null;
+
+            $existing = Participation::query()
+                ->where('student_id', $studentId)
+                ->where('class_section_id', $classSectionId)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->first();
+
+            $payload = [
+                'student_id' => (int) $studentId,
+                'school_id' => $student->school_id,
+                'class_section_id' => $classSectionId,
+                'updated_by' => $updatedBy,
+                'score' => $normalizedScore,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'updated_at' => now(),
+            ];
+
+            if ($existing) {
+                $existing->update($payload);
+            } else {
+                $payload['created_at'] = now();
+                Participation::query()->create($payload);
+            }
+            $count++;
+        }
+
+        return $count;
+    }
+}
diff --git a/app/Services/Scores/ProjectCalculator.php b/app/Services/Scores/ProjectCalculator.php
new file mode 100644
index 00000000..b4c4da27
--- /dev/null
+++ b/app/Services/Scores/ProjectCalculator.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Interfaces\ScoreCalculatorInterface;
+use App\Models\Project;
+
+class ProjectCalculator implements ScoreCalculatorInterface
+{
+    public function __construct(private Project $projectModel)
+    {
+    }
+
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        $average = Project::averageScore($studentId, $semester, $schoolYear, $classSectionId);
+        return ['project_avg' => $average !== null ? (float) $average : null];
+    }
+}
diff --git a/app/Services/Scores/ProjectScoreService.php b/app/Services/Scores/ProjectScoreService.php
new file mode 100644
index 00000000..85b43a2d
--- /dev/null
+++ b/app/Services/Scores/ProjectScoreService.php
@@ -0,0 +1,223 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\GradingLock;
+use App\Models\MissingScoreOverride;
+use App\Models\Project;
+use App\Models\Student;
+use App\Models\StudentClass;
+use Illuminate\Support\Facades\DB;
+
+class ProjectScoreService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function list(int $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $semester = $this->term->semesterLabel($semester);
+        $schoolYear = $this->term->schoolYear($schoolYear);
+
+        $headerRows = Project::query()
+            ->select('project_index')
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->orderBy('project_index')
+            ->get();
+
+        $headers = $headerRows->pluck('project_index')->map(fn ($v) => (int) $v)->unique()->values()->all();
+
+        $studentIds = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->pluck('student_id')
+            ->map(fn ($v) => (int) $v)
+            ->all();
+
+        $students = Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('is_active', 1)
+            ->orderBy('lastname')
+            ->orderBy('firstname')
+            ->get()
+            ->map(fn ($row) => [
+                'student_id' => (int) $row->id,
+                'firstname' => (string) $row->firstname,
+                'lastname' => (string) $row->lastname,
+                'scores' => [],
+            ])
+            ->all();
+
+        $scoresRows = Project::query()
+            ->select('student_id', 'project_index', 'score')
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $scoresMap = [];
+        foreach ($scoresRows as $row) {
+            $scoresMap[(int) $row['student_id']][(int) $row['project_index']] = $row['score'];
+        }
+
+        foreach ($students as &$student) {
+            foreach ($headers as $index) {
+                $student['scores'][(int) $index] = $scoresMap[$student['student_id']][$index] ?? '';
+            }
+        }
+        unset($student);
+
+        return [
+            'students' => $students,
+            'headers' => $headers,
+            'semester' => $semester,
+            'schoolYear' => $schoolYear,
+            'scoresLocked' => GradingLock::isLocked($classSectionId, $semester, $schoolYear),
+            'missingOkMap' => MissingScoreOverride::getOverridesMap($classSectionId, $semester, $schoolYear, 'project'),
+        ];
+    }
+
+    public function update(int $classSectionId, string $semester, string $schoolYear, array $scores, array $missingOk, int $updatedBy): int
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_keys($scores);
+        $indexSet = [];
+        foreach ($scores as $projects) {
+            if (!is_array($projects)) {
+                continue;
+            }
+            foreach ($projects as $index => $_) {
+                if (is_numeric($index)) {
+                    $indexSet[(int) $index] = true;
+                }
+            }
+        }
+
+        $checkedItems = [];
+        foreach ($missingOk as $studentId => $indexes) {
+            if (!is_array($indexes)) {
+                continue;
+            }
+            foreach ($indexes as $index => $flag) {
+                if (!is_numeric($index)) {
+                    continue;
+                }
+                $checkedItems[] = [
+                    'student_id' => (int) $studentId,
+                    'item_index' => (int) $index,
+                ];
+            }
+        }
+
+        MissingScoreOverride::replaceOverrides(
+            $classSectionId,
+            $semester,
+            $schoolYear,
+            'project',
+            $studentIds,
+            array_keys($indexSet),
+            $checkedItems,
+            $updatedBy
+        );
+
+        $count = 0;
+        foreach ($scores as $studentId => $projects) {
+            if (!is_numeric($studentId) || !is_array($projects)) {
+                continue;
+            }
+            $student = Student::query()->find((int) $studentId);
+            if (!$student) {
+                continue;
+            }
+
+            foreach ($projects as $index => $score) {
+                if (!is_numeric($index)) {
+                    continue;
+                }
+                $normalizedScore = is_numeric($score) ? (float) $score : null;
+
+                $existing = Project::query()
+                    ->where('student_id', $studentId)
+                    ->where('project_index', $index)
+                    ->where('class_section_id', $classSectionId)
+                    ->where('semester', $semester)
+                    ->where('school_year', $schoolYear)
+                    ->first();
+
+                $payload = [
+                    'student_id' => (int) $studentId,
+                    'school_id' => $student->school_id,
+                    'class_section_id' => $classSectionId,
+                    'updated_by' => $updatedBy,
+                    'project_index' => (int) $index,
+                    'score' => $normalizedScore,
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                    'updated_at' => now(),
+                ];
+
+                if ($existing) {
+                    $existing->update($payload);
+                } else {
+                    $payload['created_at'] = now();
+                    Project::query()->create($payload);
+                }
+                $count++;
+            }
+        }
+
+        return $count;
+    }
+
+    public function addColumn(int $classSectionId, string $semester, string $schoolYear, int $updatedBy): int
+    {
+        $maxIndex = (int) Project::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->max('project_index');
+
+        $nextIndex = $maxIndex + 1;
+
+        $students = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        foreach ($students as $student) {
+            $exists = Project::query()
+                ->where('student_id', $student->student_id)
+                ->where('project_index', $nextIndex)
+                ->where('class_section_id', $classSectionId)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->first();
+
+            if ($exists) {
+                continue;
+            }
+
+            Project::query()->create([
+                'student_id' => (int) $student->student_id,
+                'class_section_id' => $classSectionId,
+                'updated_by' => $updatedBy,
+                'project_index' => $nextIndex,
+                'score' => null,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+        }
+
+        return $nextIndex;
+    }
+}
diff --git a/app/Services/Scores/QuizCalculator.php b/app/Services/Scores/QuizCalculator.php
new file mode 100644
index 00000000..63708f75
--- /dev/null
+++ b/app/Services/Scores/QuizCalculator.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Interfaces\ScoreCalculatorInterface;
+use Illuminate\Support\Facades\DB;
+
+class QuizCalculator implements ScoreCalculatorInterface
+{
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        $q = DB::table('quiz')
+            ->select('score')
+            ->where('student_id', $studentId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear);
+
+        if ($classSectionId !== null) {
+            $q->where('class_section_id', $classSectionId);
+        }
+
+        $rows = $q->get();
+        $total = 0.0;
+        $count = 0;
+        foreach ($rows as $row) {
+            $score = $row->score ?? null;
+            if ($score === null || $score === '' || !is_numeric($score)) {
+                continue;
+            }
+            $total += (float) $score;
+            $count++;
+        }
+
+        $avg = $count > 0 ? round($total / $count, 2) : null;
+
+        return ['quiz_avg' => $avg !== null ? (float) $avg : null];
+    }
+}
diff --git a/app/Services/Scores/QuizScoreService.php b/app/Services/Scores/QuizScoreService.php
new file mode 100644
index 00000000..16989e3f
--- /dev/null
+++ b/app/Services/Scores/QuizScoreService.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\GradingLock;
+use App\Models\MissingScoreOverride;
+use App\Models\Quiz;
+use App\Models\Student;
+use App\Models\StudentClass;
+
+class QuizScoreService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function list(int $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $semester = $this->term->semesterLabel($semester);
+        $schoolYear = $this->term->schoolYear($schoolYear);
+
+        $headerRows = Quiz::query()
+            ->select('quiz_index')
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->orderBy('quiz_index')
+            ->get();
+
+        $headers = $headerRows->pluck('quiz_index')->map(fn ($v) => (int) $v)->unique()->values()->all();
+
+        $studentIds = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->pluck('student_id')
+            ->map(fn ($v) => (int) $v)
+            ->all();
+
+        $students = Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('is_active', 1)
+            ->orderBy('lastname')
+            ->orderBy('firstname')
+            ->get()
+            ->map(fn ($row) => [
+                'student_id' => (int) $row->id,
+                'firstname' => (string) $row->firstname,
+                'lastname' => (string) $row->lastname,
+                'scores' => [],
+            ])
+            ->all();
+
+        $scoresRows = Quiz::query()
+            ->select('student_id', 'quiz_index', 'score')
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $scoresMap = [];
+        foreach ($scoresRows as $row) {
+            $scoresMap[(int) $row['student_id']][(int) $row['quiz_index']] = $row['score'];
+        }
+
+        foreach ($students as &$student) {
+            foreach ($headers as $index) {
+                $student['scores'][(int) $index] = $scoresMap[$student['student_id']][$index] ?? '';
+            }
+        }
+        unset($student);
+
+        return [
+            'students' => $students,
+            'headers' => $headers,
+            'semester' => $semester,
+            'schoolYear' => $schoolYear,
+            'scoresLocked' => GradingLock::isLocked($classSectionId, $semester, $schoolYear),
+            'missingOkMap' => MissingScoreOverride::getOverridesMap($classSectionId, $semester, $schoolYear, 'quiz'),
+        ];
+    }
+
+    public function update(int $classSectionId, string $semester, string $schoolYear, array $scores, array $missingOk, int $updatedBy): int
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_keys($scores);
+        $indexSet = [];
+        foreach ($scores as $quizData) {
+            if (!is_array($quizData)) {
+                continue;
+            }
+            foreach ($quizData as $index => $_) {
+                if (is_numeric($index)) {
+                    $indexSet[(int) $index] = true;
+                }
+            }
+        }
+
+        $checkedItems = [];
+        foreach ($missingOk as $studentId => $indexes) {
+            if (!is_array($indexes)) {
+                continue;
+            }
+            foreach ($indexes as $index => $flag) {
+                if (!is_numeric($index)) {
+                    continue;
+                }
+                $checkedItems[] = [
+                    'student_id' => (int) $studentId,
+                    'item_index' => (int) $index,
+                ];
+            }
+        }
+
+        MissingScoreOverride::replaceOverrides(
+            $classSectionId,
+            $semester,
+            $schoolYear,
+            'quiz',
+            $studentIds,
+            array_keys($indexSet),
+            $checkedItems,
+            $updatedBy
+        );
+
+        $count = 0;
+        foreach ($scores as $studentId => $quizData) {
+            if (!is_numeric($studentId)) {
+                continue;
+            }
+            if (!is_array($quizData)) {
+                $quizData = [1 => $quizData];
+            }
+            foreach ($quizData as $quizNumber => $score) {
+                if (!is_numeric($quizNumber)) {
+                    continue;
+                }
+                $isBlank = $score === null || (is_string($score) && trim($score) === '');
+                $normalizedScore = (!$isBlank && is_numeric($score)) ? (float) $score : null;
+
+                $existing = Quiz::query()
+                    ->where('student_id', $studentId)
+                    ->where('quiz_index', $quizNumber)
+                    ->where('class_section_id', $classSectionId)
+                    ->where('semester', $semester)
+                    ->where('school_year', $schoolYear)
+                    ->first();
+
+                $payload = [
+                    'student_id' => (int) $studentId,
+                    'class_section_id' => $classSectionId,
+                    'updated_by' => $updatedBy,
+                    'quiz_index' => (int) $quizNumber,
+                    'score' => $normalizedScore,
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                    'updated_at' => now(),
+                ];
+
+                if ($existing) {
+                    $existing->update($payload);
+                } else {
+                    $payload['created_at'] = now();
+                    Quiz::query()->create($payload);
+                }
+                $count++;
+            }
+        }
+
+        return $count;
+    }
+
+    public function addColumn(int $classSectionId, string $semester, string $schoolYear, int $updatedBy): int
+    {
+        $maxIndex = (int) Quiz::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semester)
+            ->where('school_year', $schoolYear)
+            ->max('quiz_index');
+
+        $nextIndex = $maxIndex + 1;
+
+        $students = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('school_year', $schoolYear)
+            ->get();
+
+        foreach ($students as $student) {
+            $exists = Quiz::query()
+                ->where('student_id', $student->student_id)
+                ->where('quiz_index', $nextIndex)
+                ->where('class_section_id', $classSectionId)
+                ->where('semester', $semester)
+                ->where('school_year', $schoolYear)
+                ->first();
+
+            if ($exists) {
+                continue;
+            }
+
+            Quiz::query()->create([
+                'student_id' => (int) $student->student_id,
+                'class_section_id' => $classSectionId,
+                'updated_by' => $updatedBy,
+                'quiz_index' => $nextIndex,
+                'score' => null,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+        }
+
+        return $nextIndex;
+    }
+}
diff --git a/app/Services/Scores/ScoreCommentService.php b/app/Services/Scores/ScoreCommentService.php
new file mode 100644
index 00000000..b4a91cf8
--- /dev/null
+++ b/app/Services/Scores/ScoreCommentService.php
@@ -0,0 +1,340 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\Configuration;
+use App\Models\GradingLock;
+use App\Models\MissingScoreOverride;
+use App\Models\ScoreComment;
+use App\Models\SemesterScore;
+use App\Models\Student;
+use App\Models\StudentClass;
+use Illuminate\Support\Facades\DB;
+
+class ScoreCommentService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function list(?string $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $schoolYear = $this->term->schoolYear($schoolYear);
+        $activeSemester = $this->term->semesterLabel($semester);
+        $isAllSections = is_string($classSectionId) && strtolower(trim($classSectionId)) === 'allsections';
+        $classSectionInt = $isAllSections ? null : (int) ($classSectionId ?? 0);
+
+        $builder = DB::table('student_class as sc')
+            ->select('s.id as student_id', 's.firstname', 's.lastname', 's.school_id')
+            ->join('students as s', 's.id', '=', 'sc.student_id')
+            ->where('sc.school_year', $schoolYear)
+            ->orderBy('s.lastname')
+            ->orderBy('s.firstname')
+            ->distinct();
+
+        if (!$isAllSections && $classSectionInt) {
+            $builder->where('sc.class_section_id', $classSectionInt);
+        }
+
+        $students = $builder->get()->map(fn ($row) => (array) $row)->all();
+
+        $comments = [];
+        if (!empty($students)) {
+            $studentIds = array_map(static fn ($r) => (int) $r['student_id'], $students);
+            $rawComments = ScoreComment::query()
+                ->whereIn('student_id', $studentIds)
+                ->whereIn('score_type', ['midterm', 'final', 'ptap', 'attendance'])
+                ->where('semester', $activeSemester)
+                ->where('school_year', $schoolYear)
+                ->when(!$isAllSections && $classSectionInt, function ($q) use ($classSectionInt) {
+                    $q->where(function ($w) use ($classSectionInt) {
+                        $w->where('class_section_id', $classSectionInt)
+                          ->orWhereNull('class_section_id');
+                    });
+                })
+                ->get();
+
+            foreach ($rawComments as $comment) {
+                $sid = (int) $comment->student_id;
+                $typ = (string) $comment->score_type;
+                $comments[$sid][$typ] = [
+                    'comment' => $comment->comment,
+                    'comment_review' => $comment->comment_review,
+                    'commented_by' => $comment->commented_by,
+                    'reviewed_by' => $comment->reviewed_by,
+                ];
+            }
+
+            $attendanceScores = [];
+            $scoreRows = SemesterScore::query()
+                ->select(['student_id', 'attendance_score'])
+                ->whereIn('student_id', $studentIds)
+                ->where('semester', $activeSemester)
+                ->where('school_year', $schoolYear)
+                ->get();
+
+            foreach ($scoreRows as $row) {
+                $attendanceScores[(int) $row->student_id] = $row->attendance_score !== null
+                    ? (float) $row->attendance_score
+                    : null;
+            }
+
+            foreach ($students as $student) {
+                $sid = (int) $student['student_id'];
+                $hasComment = isset($comments[$sid]['attendance']['comment'])
+                    && trim((string) $comments[$sid]['attendance']['comment']) !== '';
+                if ($hasComment) {
+                    continue;
+                }
+                if (!function_exists('attendance_comment_from_score')) {
+                    continue;
+                }
+                $score = $attendanceScores[$sid] ?? null;
+                if ($score === null) {
+                    continue;
+                }
+                $auto = attendance_comment_from_score($score, $student['firstname'] ?? '');
+                if ($auto !== null) {
+                    $comments[$sid]['attendance'] = [
+                        'comment' => $auto,
+                        'comment_review' => $comments[$sid]['attendance']['comment_review'] ?? null,
+                        'commented_by' => $comments[$sid]['attendance']['commented_by'] ?? null,
+                        'reviewed_by' => $comments[$sid]['attendance']['reviewed_by'] ?? null,
+                    ];
+                }
+            }
+        }
+
+        return [
+            'students' => $students,
+            'comments' => $comments,
+            'semester' => $activeSemester,
+            'schoolYear' => $schoolYear,
+            'classSectionId' => $isAllSections ? 'allsections' : $classSectionInt,
+            'scoresLocked' => (!$isAllSections && $classSectionInt)
+                ? GradingLock::isLocked($classSectionInt, $activeSemester, $schoolYear)
+                : false,
+        ];
+    }
+
+    public function save(int $classSectionId, string $semester, string $schoolYear, array $comments, array $missingOk, int $teacherId): array
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_map('intval', array_keys($comments));
+        $studentNames = $this->getStudentFirstNames($studentIds);
+
+        $isFall = strtolower($semester) === 'fall';
+        $isSpring = strtolower($semester) === 'spring';
+        $commentTypes = ['ptap_comment'];
+        if ($isFall) {
+            $commentTypes[] = 'midterm_comment';
+        }
+        if ($isSpring) {
+            $commentTypes[] = 'final_comment';
+        }
+
+        foreach ($commentTypes as $type) {
+            $checkedItems = [];
+            foreach ($missingOk as $studentId => $types) {
+                if (!is_array($types) || empty($types[$type])) {
+                    continue;
+                }
+                $checkedItems[] = [
+                    'student_id' => (int) $studentId,
+                    'item_index' => null,
+                ];
+            }
+            MissingScoreOverride::replaceOverrides(
+                $classSectionId,
+                $semester,
+                $schoolYear,
+                $type,
+                $studentIds,
+                null,
+                $checkedItems,
+                $teacherId,
+                true
+            );
+        }
+
+        $errors = [];
+        foreach ($comments as $studentId => $commentTypes) {
+            foreach ($commentTypes as $scoreType => $comment) {
+                $normalizedScoreType = strtolower((string) $scoreType);
+                $trimmedComment = trim((string) $comment);
+                if ($trimmedComment === '') {
+                    continue;
+                }
+                $validationError = $this->validateComment($trimmedComment, (int) $studentId, $normalizedScoreType, $studentNames);
+                if ($validationError !== null) {
+                    $errors[] = $validationError;
+                    continue;
+                }
+
+                $existing = ScoreComment::query()
+                    ->where('student_id', $studentId)
+                    ->where('score_type', $normalizedScoreType)
+                    ->where('semester', $semester)
+                    ->where('school_year', $schoolYear)
+                    ->where(function ($q) use ($classSectionId) {
+                        $q->where('class_section_id', $classSectionId)
+                          ->orWhereNull('class_section_id');
+                    })
+                    ->first();
+
+                $data = [
+                    'student_id' => $studentId,
+                    'class_section_id' => $classSectionId,
+                    'score_type' => $normalizedScoreType,
+                    'semester' => $semester,
+                    'school_year' => $schoolYear,
+                    'comment' => $trimmedComment,
+                    'commented_by' => $teacherId,
+                    'created_at' => now(),
+                ];
+
+                if ($existing) {
+                    $existing->update($data);
+                } else {
+                    ScoreComment::query()->create($data);
+                }
+            }
+        }
+
+        return ['errors' => $errors];
+    }
+
+    public function update(int $classSectionId, string $semester, string $schoolYear, array $comments, array $reviews, int $teacherId): array
+    {
+        if (GradingLock::isLocked($classSectionId, $semester, $schoolYear)) {
+            throw new \RuntimeException('Scores are locked for this class.');
+        }
+
+        $studentIds = array_unique(array_map('intval', array_merge(array_keys($comments), array_keys($reviews))));
+        $studentNames = $this->getStudentFirstNames($studentIds);
+        $isReviewer = $this->isReviewer();
+
+        $errors = [];
+        foreach ($comments as $studentId => $types) {
+            foreach ($types as $scoreType => $commentText) {
+                $normalizedScoreType = strtolower((string) $scoreType);
+                $commentText = trim((string) $commentText);
+
+                $reviewText = isset($reviews[$studentId][$scoreType])
+                    ? trim((string) $reviews[$studentId][$scoreType])
+                    : '';
+
+                if ($commentText === '' && $reviewText === '') {
+                    continue;
+                }
+
+                if ($commentText !== '') {
+                    $validationError = $this->validateComment($commentText, (int) $studentId, $normalizedScoreType, $studentNames);
+                    if ($validationError !== null) {
+                        $errors[] = $validationError;
+                        continue;
+                    }
+                }
+
+                $existing = ScoreComment::query()
+                    ->where('student_id', $studentId)
+                    ->where('score_type', $normalizedScoreType)
+                    ->where('semester', $semester)
+                    ->where('school_year', $schoolYear)
+                    ->where(function ($q) use ($classSectionId) {
+                        $q->where('class_section_id', $classSectionId)
+                          ->orWhereNull('class_section_id');
+                    })
+                    ->first();
+
+                $data = [
+                    'comment' => $commentText === '' ? null : $commentText,
+                    'commented_by' => $teacherId,
+                    'class_section_id' => $classSectionId,
+                ];
+
+                if ($isReviewer && $reviewText !== '') {
+                    $data['comment_review'] = $reviewText;
+                    $data['reviewed_by'] = $teacherId;
+                }
+
+                if ($existing) {
+                    $existing->update($data);
+                } else {
+                    ScoreComment::query()->create(array_merge([
+                        'student_id' => $studentId,
+                        'score_type' => $normalizedScoreType,
+                        'semester' => $semester,
+                        'school_year' => $schoolYear,
+                        'class_section_id' => $classSectionId,
+                    ], $data));
+                }
+            }
+        }
+
+        return ['errors' => $errors];
+    }
+
+    private function getStudentFirstNames(array $studentIds): array
+    {
+        $ids = array_values(array_filter(array_unique(array_map('intval', $studentIds)), static fn ($id) => $id > 0));
+        if (empty($ids)) {
+            return [];
+        }
+
+        $rows = Student::query()
+            ->select(['id', 'firstname'])
+            ->whereIn('id', $ids)
+            ->get();
+
+        $names = [];
+        foreach ($rows as $row) {
+            $names[(int) $row->id] = trim((string) $row->firstname);
+        }
+
+        return $names;
+    }
+
+    private function validateComment(string $comment, int $studentId, string $scoreType, array $studentNames): ?string
+    {
+        $trimmed = trim($comment);
+        if ($trimmed === '') {
+            return null;
+        }
+
+        $firstName = $studentNames[$studentId] ?? '';
+        if ($firstName === '') {
+            return "Missing student first name for student ID {$studentId}.";
+        }
+
+        $length = mb_strlen($trimmed, 'UTF-8');
+        if ($length < 100) {
+            return "{$firstName}'s {$scoreType} comment must be at least 100 characters.";
+        }
+        if ($length > 400) {
+            return "{$firstName}'s {$scoreType} comment must be at most 400 characters.";
+        }
+
+        $pattern = '/^' . preg_quote($firstName, '/') . '\\b/i';
+        if (!preg_match($pattern, $trimmed)) {
+            return "{$firstName}'s {$scoreType} comment must start with the student's first name.";
+        }
+
+        return null;
+    }
+
+    private function isReviewer(): bool
+    {
+        $currentUserRole = session()->get('role');
+        $reviewerRoles = (string) (Configuration::getConfig('comment_reviewer') ?? '');
+        if ($reviewerRoles === '') {
+            return false;
+        }
+
+        $allowedRoles = array_map('trim', explode(',', $reviewerRoles));
+        return in_array($currentUserRole, $allowedRoles, true);
+    }
+}
diff --git a/app/Services/Scores/ScoreDashboardService.php b/app/Services/Scores/ScoreDashboardService.php
new file mode 100644
index 00000000..c227e323
--- /dev/null
+++ b/app/Services/Scores/ScoreDashboardService.php
@@ -0,0 +1,243 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\ClassSection;
+use App\Models\Configuration;
+use App\Models\GradingLock;
+use App\Models\MissingScoreOverride;
+use App\Models\ScoreComment;
+use App\Models\SemesterScore;
+use App\Models\Student;
+use App\Models\StudentClass;
+use App\Models\TeacherClass;
+use Illuminate\Support\Facades\DB;
+
+class ScoreDashboardService
+{
+    public function __construct(private ScoreTermService $term)
+    {
+    }
+
+    public function overview(int $teacherId, ?int $classSectionId, ?string $semester, ?string $schoolYear): array
+    {
+        $schoolYear = $this->term->schoolYear($schoolYear);
+        $semesterLabel = $this->term->semesterLabel($semester, $semester);
+
+        $assignments = TeacherClass::query()
+            ->where('teacher_id', $teacherId)
+            ->when($schoolYear !== '', fn ($q) => $q->where('school_year', $schoolYear))
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        if (empty($assignments)) {
+            return ['students' => [], 'assignments' => [], 'class_section_id' => null];
+        }
+
+        $allowedIds = array_values(array_unique(array_map(static fn ($a) => (int) ($a['class_section_id'] ?? 0), $assignments)));
+        $classSectionId = $classSectionId && in_array($classSectionId, $allowedIds, true) ? $classSectionId : $allowedIds[0];
+
+        $studentIds = StudentClass::query()
+            ->where('class_section_id', $classSectionId)
+            ->when($schoolYear !== '', fn ($q) => $q->where('school_year', $schoolYear))
+            ->pluck('student_id')
+            ->map(fn ($v) => (int) $v)
+            ->all();
+
+        $students = Student::query()
+            ->whereIn('id', $studentIds)
+            ->where('is_active', 1)
+            ->orderBy('lastname')
+            ->orderBy('firstname')
+            ->get()
+            ->map(fn ($row) => [
+                'student_id' => (int) $row->id,
+                'firstname' => (string) $row->firstname,
+                'lastname' => (string) $row->lastname,
+                'school_id' => $row->school_id,
+            ])
+            ->all();
+
+        $scores = SemesterScore::query()
+            ->where('class_section_id', $classSectionId)
+            ->where('semester', $semesterLabel)
+            ->where('school_year', $schoolYear)
+            ->get()
+            ->keyBy('student_id');
+
+        $comments = ScoreComment::query()
+            ->where('semester', $semesterLabel)
+            ->where('school_year', $schoolYear)
+            ->whereIn('student_id', $studentIds)
+            ->get();
+
+        $commentMap = [];
+        foreach ($comments as $comment) {
+            $commentMap[(int) $comment->student_id][(string) $comment->score_type] = [
+                'comment' => $comment->comment,
+                'comment_review' => $comment->comment_review,
+            ];
+        }
+
+        foreach ($students as &$student) {
+            $sid = $student['student_id'];
+            $scoreRow = $scores[$sid] ?? null;
+            $student['scores'] = $scoreRow ? [
+                'homework' => $scoreRow->homework_avg,
+                'quiz' => $scoreRow->quiz_avg,
+                'project' => $scoreRow->project_avg,
+                'midterm_exam' => $scoreRow->midterm_exam_score,
+                'final_exam' => $scoreRow->final_exam_score,
+                'attendance' => $scoreRow->attendance_score,
+                'ptap' => $scoreRow->ptap_score,
+                'semester' => $scoreRow->semester_score,
+            ] : [];
+            $student['comments'] = $commentMap[$sid] ?? [];
+        }
+        unset($student);
+
+        $classSection = ClassSection::query()->where('class_section_id', $classSectionId)->first();
+
+        return [
+            'students' => $students,
+            'class_section_id' => $classSectionId,
+            'class_section_name' => $classSection?->class_section_name,
+            'semester' => $semesterLabel,
+            'school_year' => $schoolYear,
+            'scoresLocked' => GradingLock::isLocked($classSectionId, $semesterLabel, $schoolYear),
+        ];
+    }
+
+    public function submitScoresLock(int $classSectionId, string $semester, string $schoolYear, array $missingOk, int $teacherId): void
+    {
+        $isFall = strtolower($semester) === 'fall';
+        $isSpring = strtolower($semester) === 'spring';
+        $studentIds = array_keys((array) $missingOk);
+
+        $commentTypes = ['ptap_comment'];
+        if ($isFall) {
+            $commentTypes[] = 'midterm_comment';
+        }
+        if ($isSpring) {
+            $commentTypes[] = 'final_comment';
+        }
+
+        foreach ($commentTypes as $type) {
+            $checkedItems = [];
+            foreach ($missingOk as $studentId => $types) {
+                if (!is_array($types) || empty($types[$type])) {
+                    continue;
+                }
+                $checkedItems[] = [
+                    'student_id' => (int) $studentId,
+                    'item_index' => null,
+                ];
+            }
+            MissingScoreOverride::replaceOverrides(
+                $classSectionId,
+                $semester,
+                $schoolYear,
+                $type,
+                $studentIds,
+                null,
+                $checkedItems,
+                $teacherId,
+                true
+            );
+        }
+
+        $existing = GradingLock::getLock($classSectionId, $semester, $schoolYear);
+        if ($existing && $existing->is_locked) {
+            return;
+        }
+
+        if ($existing) {
+            $existing->update([
+                'is_locked' => 1,
+                'locked_by' => $teacherId > 0 ? $teacherId : null,
+                'locked_at' => now(),
+            ]);
+        } else {
+            GradingLock::query()->create([
+                'class_section_id' => $classSectionId,
+                'semester' => $semester,
+                'school_year' => $schoolYear,
+                'is_locked' => 1,
+                'locked_by' => $teacherId > 0 ? $teacherId : null,
+                'locked_at' => now(),
+            ]);
+        }
+    }
+
+    public function viewStudentScores(int $parentId, string $schoolYear): array
+    {
+        $students = DB::table('students')
+            ->select('students.id', 'students.school_id', 'students.firstname', 'students.lastname', 'classSection.class_section_name')
+            ->leftJoin('student_class', 'student_class.student_id', '=', 'students.id')
+            ->leftJoin('classSection', 'classSection.class_section_id', '=', 'student_class.class_section_id')
+            ->where('students.parent_id', $parentId)
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+
+        $scores = [];
+        if (!empty($students)) {
+            $studentIdList = array_column($students, 'id');
+            $semesterScores = DB::table('semester_scores')
+                ->whereIn('student_id', $studentIdList)
+                ->where('school_year', $schoolYear)
+                ->get()
+                ->map(fn ($row) => (array) $row)
+                ->all();
+
+            $scoresByStudent = [];
+            foreach ($semesterScores as $score) {
+                $studentIdKey = (int) ($score['student_id'] ?? 0);
+                $semesterName = trim((string) ($score['semester'] ?? ''));
+                if ($studentIdKey === 0 || $semesterName === '') {
+                    continue;
+                }
+                $normalizedSemester = ucfirst(strtolower($semesterName));
+                $scoresByStudent[$studentIdKey][$normalizedSemester] = $score;
+            }
+
+            foreach ($students as $student) {
+                $studentId = (int) $student['id'];
+                if (empty($scoresByStudent[$studentId])) {
+                    continue;
+                }
+                foreach ($scoresByStudent[$studentId] as $semester => $score) {
+                    $scores[$schoolYear][$semester][$studentId] = [
+                        'student_id' => $studentId,
+                        'school_id' => $student['school_id'],
+                        'student_firstname' => $student['firstname'],
+                        'student_lastname' => $student['lastname'],
+                        'class_section_name' => $student['class_section_name'] ?? 'Unknown Class',
+                        'comment' => $score['comment'] ?? null,
+                        'scores' => [
+                            'homework' => ['score' => $score['homework_avg'] ?? '-'],
+                            'quiz' => ['score' => $score['quiz_avg'] ?? '-'],
+                            'project' => ['score' => $score['project_avg'] ?? '-'],
+                            'attendance' => ['score' => $score['attendance_score'] ?? '-'],
+                            'participation_score' => ['score' => $score['participation_score'] ?? '-'],
+                            'ptap' => ['score' => $score['ptap_score'] ?? '-'],
+                            'midterm_exam' => ['score' => $score['midterm_exam_score'] ?? '-'],
+                            'final_exam' => ['score' => $score['final_exam_score'] ?? '-'],
+                            'semester' => ['score' => $score['semester_score'] ?? '-'],
+                        ],
+                    ];
+                }
+            }
+        }
+
+        $schoolYears = DB::table('semester_scores')->select('school_year')->distinct()->pluck('school_year')->all();
+        rsort($schoolYears);
+
+        return [
+            'scores' => $scores,
+            'schoolYears' => $schoolYears,
+            'selectedYear' => $schoolYear,
+        ];
+    }
+}
diff --git a/app/Services/Scores/ScorePredictorDataService.php b/app/Services/Scores/ScorePredictorDataService.php
new file mode 100644
index 00000000..297b7491
--- /dev/null
+++ b/app/Services/Scores/ScorePredictorDataService.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Services\Scores;
+
+use Illuminate\Support\Facades\DB;
+
+class ScorePredictorDataService
+{
+    public function classSections(string $schoolYear): array
+    {
+        return DB::table('classSection as cs')
+            ->select('cs.*')
+            ->join('student_class as sc', 'sc.class_section_id', '=', 'cs.class_section_id')
+            ->where('sc.school_year', $schoolYear)
+            ->notLike('cs.class_section_name', 'KG', 'after')
+            ->groupBy('cs.id')
+            ->orderBy('cs.class_section_name', 'ASC')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    public function students(string $schoolYear, ?int $classSectionId = null): array
+    {
+        $builder = DB::table('students as s')
+            ->select([
+                's.id as student_id',
+                's.school_id',
+                's.firstname',
+                's.lastname',
+                'fall.semester_score as fall_score',
+                'spring.semester_score as spring_score',
+                'sc.class_section_id as class_section_id',
+            ])
+            ->leftJoin('student_class as sc', function ($join) use ($schoolYear) {
+                $join->on('sc.student_id', '=', 's.id')
+                    ->where('sc.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
+            ->leftJoin('semester_scores as fall', function ($join) use ($schoolYear) {
+                $join->on('fall.student_id', '=', 's.id')
+                    ->where('fall.semester', '=', 'fall')
+                    ->where('fall.school_year', '=', $schoolYear);
+            })
+            ->leftJoin('semester_scores as spring', function ($join) use ($schoolYear) {
+                $join->on('spring.student_id', '=', 's.id')
+                    ->where('spring.semester', '=', 'spring')
+                    ->where('spring.school_year', '=', $schoolYear);
+            })
+            ->where('s.is_active', 1)
+            ->where(function ($q) {
+                $q->whereNull('cs.class_section_name')
+                    ->orWhere('cs.class_section_name', 'not like', 'KG%');
+            });
+
+        if (!empty($classSectionId)) {
+            $builder->where('sc.class_section_id', $classSectionId);
+        }
+
+        return $builder
+            ->groupBy('s.id')
+            ->get()
+            ->map(fn ($row) => (array) $row)
+            ->all();
+    }
+
+    public function springStats(string $schoolYear, ?int $classSectionId = null): array
+    {
+        $builder = DB::table('semester_scores')
+            ->select('semester_scores.semester_score')
+            ->join('student_class', 'student_class.student_id', '=', 'semester_scores.student_id')
+            ->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'student_class.class_section_id')
+            ->where('semester_scores.semester', 'spring')
+            ->where('semester_scores.school_year', $schoolYear)
+            ->where('student_class.school_year', $schoolYear)
+            ->where(function ($q) {
+                $q->whereNull('cs.class_section_name')
+                    ->orWhere('cs.class_section_name', 'not like', 'KG%');
+            });
+
+        if (!empty($classSectionId)) {
+            $builder->where('student_class.class_section_id', $classSectionId);
+        }
+
+        $scores = $builder->pluck('semester_scores.semester_score')->filter(function ($v) {
+            return is_numeric($v);
+        })->map(fn ($v) => (float) $v)->all();
+
+        if (empty($scores)) {
+            return ['mean' => 70.0, 'std' => 0.0];
+        }
+
+        $mean = array_sum($scores) / count($scores);
+        $variance = 0.0;
+        foreach ($scores as $value) {
+            $variance += ($value - $mean) ** 2;
+        }
+        $variance = $variance / count($scores);
+
+        return [
+            'mean' => (float) $mean,
+            'std' => (float) sqrt($variance),
+        ];
+    }
+}
diff --git a/app/Services/Scores/ScorePredictorRiskService.php b/app/Services/Scores/ScorePredictorRiskService.php
new file mode 100644
index 00000000..cbb9ad1b
--- /dev/null
+++ b/app/Services/Scores/ScorePredictorRiskService.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Services\Scores;
+
+class ScorePredictorRiskService
+{
+    public function normalCdf(float $z): float
+    {
+        $t = 1 / (1 + 0.3275911 * abs($z));
+        $a1 = 0.254829592;
+        $a2 = -0.284496736;
+        $a3 = 1.421413741;
+        $a4 = -1.453152027;
+        $a5 = 1.061405429;
+        $erf = 1 - ((((($a5 * $t + $a4) * $t + $a3) * $t + $a2) * $t + $a1) * $t) * exp(-$z * $z);
+        $sign = $z < 0 ? -1 : 1;
+        return 0.5 * (1 + $sign * $erf);
+    }
+
+    public function evaluate(array $students, float $mean, float $std, float $trophyThreshold, float $targetLow): array
+    {
+        $results = [];
+
+        foreach ($students as $student) {
+            $fallScore = is_numeric($student['fall_score'] ?? null) ? (float) $student['fall_score'] : null;
+            $springScore = is_numeric($student['spring_score'] ?? null) ? (float) $student['spring_score'] : null;
+
+            $scoreParts = array_values(array_filter([$fallScore, $springScore], static fn ($v) => $v !== null));
+            $finalAvg = !empty($scoreParts) ? round(array_sum($scoreParts) / count($scoreParts), 1) : null;
+
+            $waitingForSpring = ($fallScore !== null && $springScore === null);
+
+            $requiredHigh = $waitingForSpring ? round(2 * $trophyThreshold - $fallScore, 2) : null;
+            $requiredLow = $waitingForSpring ? round(2 * $targetLow - $fallScore, 2) : null;
+
+            $zHigh = ($requiredHigh !== null && $std > 0) ? ($requiredHigh - $mean) / $std : null;
+            $zLow = ($requiredLow !== null && $std > 0) ? ($requiredLow - $mean) / $std : null;
+
+            $probHigh = $zHigh !== null ? 1 - $this->normalCdf($zHigh) : null;
+            $probLow = $zLow !== null ? $this->normalCdf($zLow) : null;
+
+            $riskHigh = match (true) {
+                $finalAvg !== null && !$waitingForSpring && $finalAvg >= $trophyThreshold => 'Achieved Trophy',
+                $finalAvg !== null && !$waitingForSpring => 'Unreachable',
+                $requiredHigh !== null && $requiredHigh > 100 => 'Unreachable',
+                is_null($probHigh) => 'New student',
+                $probHigh >= 0.66 => 'Low',
+                $probHigh >= 0.33 => 'Medium',
+                default => 'High',
+            };
+
+            $riskLow = match (true) {
+                $finalAvg !== null && !$waitingForSpring && $finalAvg < $targetLow => 'High',
+                $finalAvg !== null && !$waitingForSpring => 'Low',
+                $requiredLow !== null && $requiredLow > 100 => 'Unlikely to pass',
+                is_null($probLow) => 'New student',
+                $probLow >= 0.66 => 'High',
+                $probLow >= 0.33 => 'Medium',
+                default => 'Low',
+            };
+
+            if ($finalAvg === null) {
+                $status = 'Undetermined';
+            } elseif ($waitingForSpring) {
+                $status = in_array($riskLow, ['High', 'Unlikely to pass'], true) ? 'May fail' : 'Can pass';
+            } else {
+                $status = $finalAvg >= 60 ? 'Passed' : 'Failed';
+            }
+
+            $results[] = [
+                'student_id' => (int) ($student['student_id'] ?? 0),
+                'school_id' => $student['school_id'] ?? null,
+                'firstname' => $student['firstname'] ?? null,
+                'lastname' => $student['lastname'] ?? null,
+                'class_section_id' => $student['class_section_id'] ?? null,
+                'fall_score' => $student['fall_score'] ?? 'N/A',
+                'spring_score' => $student['spring_score'] ?? 'N/A',
+                'final_average' => $finalAvg ?? 'N/A',
+                'required_spring_score' => $requiredHigh ?? 'N/A',
+                'winning_risk' => $riskHigh,
+                'required_spring_to_pass' => $requiredLow ?? 'N/A',
+                'failure_risk' => $riskLow,
+                'status' => $status,
+                'trophy_awarded' => ($riskHigh === 'Achieved Trophy'),
+                'trophy_reason' => ($riskHigh === 'Achieved Trophy') ? 'threshold' : '',
+            ];
+        }
+
+        return $this->applyTop3Trophy($results);
+    }
+
+    private function applyTop3Trophy(array $results): array
+    {
+        $bySection = [];
+        $hasThresholdTrophy = [];
+
+        foreach ($results as $idx => $row) {
+            $cid = (string) ($row['class_section_id'] ?? '');
+            $bySection[$cid][] = $idx;
+            if (($row['trophy_reason'] ?? '') === 'threshold') {
+                $hasThresholdTrophy[$cid] = true;
+            }
+        }
+
+        foreach ($bySection as $cid => $indices) {
+            if (!empty($hasThresholdTrophy[$cid])) {
+                continue;
+            }
+            $candidates = [];
+            foreach ($indices as $idx) {
+                $val = $results[$idx]['final_average'] ?? null;
+                if (!is_numeric($val)) {
+                    $fall = $results[$idx]['fall_score'] ?? null;
+                    $spring = $results[$idx]['spring_score'] ?? null;
+                    $parts = [];
+                    if (is_numeric($fall)) $parts[] = (float) $fall;
+                    if (is_numeric($spring)) $parts[] = (float) $spring;
+                    if (!empty($parts)) {
+                        $val = array_sum($parts) / count($parts);
+                    }
+                }
+                if (is_numeric($val)) {
+                    $candidates[] = ['idx' => $idx, 'avg' => (float) $val];
+                }
+            }
+            if (empty($candidates)) {
+                continue;
+            }
+            usort($candidates, static fn ($a, $b) => $b['avg'] <=> $a['avg']);
+            $top = array_slice($candidates, 0, 3);
+            foreach ($top as $entry) {
+                $i = $entry['idx'];
+                $results[$i]['trophy_awarded'] = true;
+                $results[$i]['trophy_reason'] = 'top3';
+                $results[$i]['winning_risk'] = 'Top 3 Trophy';
+            }
+        }
+
+        usort($results, static fn ($a, $b) => ($b['final_average'] ?? 0) <=> ($a['final_average'] ?? 0));
+
+        return $results;
+    }
+}
diff --git a/app/Services/Scores/ScorePredictorService.php b/app/Services/Scores/ScorePredictorService.php
new file mode 100644
index 00000000..5f37be9f
--- /dev/null
+++ b/app/Services/Scores/ScorePredictorService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\Configuration;
+
+class ScorePredictorService
+{
+    public function __construct(
+        private ScorePredictorDataService $dataService,
+        private ScorePredictorRiskService $riskService
+    ) {
+    }
+
+    public function report(?string $schoolYear, ?int $classSectionId = null): array
+    {
+        $currentSchoolYear = (string) (Configuration::getConfig('school_year') ?? '');
+        $semester = (string) (Configuration::getConfig('semester') ?? '');
+        $targetTrophy = (float) (Configuration::getConfig('trophy_score') ?? 94.0);
+        $targetLow = (float) (Configuration::getConfig('pass_score') ?? 60.0);
+
+        $selectedYear = $schoolYear ?: $currentSchoolYear;
+        $classSections = $this->dataService->classSections($selectedYear);
+        $students = $this->dataService->students($selectedYear, $classSectionId);
+
+        $stats = $this->dataService->springStats($selectedYear, $classSectionId);
+        $mean = (float) ($stats['mean'] ?? 70.0);
+        $std = (float) ($stats['std'] ?? 0.0);
+
+        $trophyThreshold = max(94.0, $targetTrophy);
+        $results = $this->riskService->evaluate($students, $mean, $std, $trophyThreshold, $targetLow);
+
+        return [
+            'students' => $results,
+            'school_year' => $selectedYear,
+            'class_sections' => $classSections,
+            'selected_class_section_id' => $classSectionId,
+            'semester' => $semester,
+        ];
+    }
+}
diff --git a/app/Services/Scores/ScoreTermService.php b/app/Services/Scores/ScoreTermService.php
new file mode 100644
index 00000000..d57d820f
--- /dev/null
+++ b/app/Services/Scores/ScoreTermService.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Models\Configuration;
+
+class ScoreTermService
+{
+    public function normalizeSemester(?string $input): string
+    {
+        $value = strtolower(trim((string) $input));
+        if ($value === 'fall' || str_contains($value, '1')) {
+            return 'fall';
+        }
+        if ($value === 'spring' || str_contains($value, '2')) {
+            return 'spring';
+        }
+        return '';
+    }
+
+    public function semesterLabel(?string $input, ?string $fallback = null): string
+    {
+        $normalized = $this->normalizeSemester($input);
+        if ($normalized !== '') {
+            return ucfirst($normalized);
+        }
+        if ($fallback && trim($fallback) !== '') {
+            return (string) $fallback;
+        }
+
+        return (string) (Configuration::getConfig('semester') ?? 'Fall');
+    }
+
+    public function schoolYear(?string $input, ?string $fallback = null): string
+    {
+        $value = trim((string) $input);
+        if ($value !== '') {
+            return $value;
+        }
+        if ($fallback && trim($fallback) !== '') {
+            return (string) $fallback;
+        }
+
+        return (string) (Configuration::getConfig('school_year') ?? '');
+    }
+
+    public function semesterVariants(?string $semester): array
+    {
+        $raw = trim((string) $semester);
+        $variants = [
+            $raw,
+            strtolower($raw),
+            ucfirst(strtolower($raw)),
+        ];
+        $normalized = $this->normalizeSemester($raw);
+        if ($normalized === 'fall') {
+            $variants[] = 'First Semester';
+            $variants[] = 'Semester 1';
+            $variants[] = '1st Semester';
+            $variants[] = 'Fall Semester';
+        } elseif ($normalized === 'spring') {
+            $variants[] = 'Second Semester';
+            $variants[] = 'Semester 2';
+            $variants[] = '2nd Semester';
+            $variants[] = 'Spring Semester';
+        }
+
+        return array_values(array_unique(array_filter($variants, static fn ($v) => $v !== '')));
+    }
+}
diff --git a/app/Services/Scores/SemesterScoreService.php b/app/Services/Scores/SemesterScoreService.php
new file mode 100644
index 00000000..ed3f35ed
--- /dev/null
+++ b/app/Services/Scores/SemesterScoreService.php
@@ -0,0 +1,227 @@
+<?php
+
+namespace App\Services\Scores;
+
+use App\Interfaces\ScoreCalculatorInterface;
+use App\Models\Configuration;
+use App\Models\FinalExam;
+use App\Models\MidtermExam;
+use App\Models\Participation;
+use App\Models\SemesterScore;
+use App\Services\Scores\AttendanceCalculator;
+use App\Services\Scores\HomeworkCalculator;
+use App\Services\Scores\ProjectCalculator;
+use App\Services\Scores\QuizCalculator;
+use App\Models\AttendanceRecord;
+use App\Models\CalendarEvent;
+use App\Models\Homework;
+use App\Models\Project;
+use RuntimeException;
+
+class SemesterScoreService
+{
+    /** @var array<string, ScoreCalculatorInterface> */
+    private array $scoreCalculators = [];
+
+    private string $semester;
+    private string $schoolYear;
+    private ?int $actorId;
+
+    public function __construct(
+        ?AttendanceCalculator $attendanceCalculator = null,
+        ?HomeworkCalculator $homeworkCalculator = null,
+        ?QuizCalculator $quizCalculator = null,
+        ?ProjectCalculator $projectCalculator = null
+    ) {
+        $this->semester = (string) (Configuration::getConfig('semester') ?? '');
+        $this->schoolYear = (string) (Configuration::getConfig('school_year') ?? '');
+        $this->actorId = (int) (auth()->id() ?? 0) ?: null;
+
+        $attendanceCalculator = $attendanceCalculator ?? new AttendanceCalculator(
+            new AttendanceRecord(),
+            new Configuration(),
+            new CalendarEvent()
+        );
+        $homeworkCalculator = $homeworkCalculator ?? new HomeworkCalculator(new Homework());
+        $quizCalculator = $quizCalculator ?? new QuizCalculator();
+        $projectCalculator = $projectCalculator ?? new ProjectCalculator(new Project());
+
+        $this->scoreCalculators = [
+            AttendanceCalculator::class => $attendanceCalculator,
+            HomeworkCalculator::class => $homeworkCalculator,
+            QuizCalculator::class => $quizCalculator,
+            ProjectCalculator::class => $projectCalculator,
+        ];
+    }
+
+    public function updateScoresForStudents(array $students, ?string $semester = null, ?string $schoolYear = null): void
+    {
+        $semester = $semester ?? $this->semester;
+        $schoolYear = $schoolYear ?? $this->schoolYear;
+
+        foreach ($students as $student) {
+            $this->updateStudentScores($student, $semester, $schoolYear);
+        }
+    }
+
+    public function updateStudentScores(array $student, string $semester, string $schoolYear): void
+    {
+        foreach (['student_id', 'school_id', 'class_section_id'] as $field) {
+            if (!isset($student[$field])) {
+                throw new RuntimeException("Missing required student field: {$field}");
+            }
+        }
+
+        $updatedBy = isset($student['updated_by'])
+            ? (int) $student['updated_by']
+            : ($this->actorId ?? null);
+
+        $scoreData = $this->calculateAllScores(
+            (int) $student['student_id'],
+            $semester,
+            $schoolYear,
+            (int) ($student['class_section_id'] ?? 0) ?: null
+        );
+
+        $this->saveStudentScores(
+            (int) $student['student_id'],
+            (string) $student['school_id'],
+            (int) $student['class_section_id'],
+            $updatedBy,
+            $semester,
+            $schoolYear,
+            $scoreData
+        );
+    }
+
+    private function calculateAllScores(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        $scoreData = [
+            'updated_at' => now(),
+        ];
+
+        foreach ($this->scoreCalculators as $calculator) {
+            try {
+                $scoreData = array_merge(
+                    $scoreData,
+                    $calculator->calculate($studentId, $semester, $schoolYear, $classSectionId)
+                );
+            } catch (\Throwable $e) {
+                // ignore calculator errors to keep scoring pipeline running
+            }
+        }
+
+        if (!isset($scoreData['participation_score'])) {
+            $participationScore = Participation::getParticipationScore($studentId, $semester, $schoolYear, $classSectionId);
+            $scoreData['participation_score'] = $participationScore !== null ? (float) $participationScore : null;
+        }
+
+        $scoreData['ptap_score'] = $this->calculatePTAPScore($scoreData);
+        $midfinal = $this->calculateSemesterScore($scoreData, $semester, $studentId, $schoolYear, $classSectionId);
+
+        return array_merge($scoreData, [
+            'semester_score' => $midfinal['semester_score'],
+            'midterm_exam_score' => $midfinal['midterm_score'],
+            'final_exam_score' => $midfinal['final_score'],
+            'participation_score' => $scoreData['participation_score'],
+        ]);
+    }
+
+    private function calculatePTAPScore(array $scores): ?float
+    {
+        $avgHomework = $scores['homework_avg'] ?? null;
+        $avgQuiz = $scores['quiz_avg'] ?? null;
+        $avgProject = $scores['project_avg'] ?? null;
+        $avgParticipation = $scores['participation_score'] ?? null;
+
+        $hasTests = $avgQuiz !== null;
+        $hasProjects = $avgProject !== null;
+
+        if (!$hasTests && !$hasProjects) {
+            if ($avgHomework === null || $avgParticipation === null) {
+                return null;
+            }
+            return round(($avgHomework * 0.5) + ($avgParticipation * 0.5), 1);
+        }
+
+        if (!$hasProjects) {
+            if ($avgHomework === null || $avgParticipation === null || $avgQuiz === null) {
+                return null;
+            }
+            return round(($avgHomework * 0.4) + ($avgParticipation * 0.4) + ($avgQuiz * 0.2), 1);
+        }
+
+        if (!$hasTests) {
+            if ($avgHomework === null || $avgParticipation === null || $avgProject === null) {
+                return null;
+            }
+            return round(($avgHomework * 0.34) + ($avgParticipation * 0.33) + ($avgProject * 0.33), 1);
+        }
+
+        if ($avgHomework === null || $avgParticipation === null || $avgProject === null || $avgQuiz === null) {
+            return null;
+        }
+
+        return round(
+            ($avgHomework * 0.3) + ($avgParticipation * 0.3) + ($avgProject * 0.3) + ($avgQuiz * 0.1),
+            1
+        );
+    }
+
+    private function calculateSemesterScore(array $scores, string $semester, int $studentId, string $schoolYear, ?int $classSectionId): array
+    {
+        $ptap = $scores['ptap_score'] ?? null;
+        $attendance = $scores['attendance_score'] ?? null;
+
+        $out = [
+            'midterm_score' => null,
+            'final_score' => null,
+            'semester_score' => null,
+        ];
+
+        if (strcasecmp($semester, 'Fall') === 0) {
+            $mid = $scores['midterm_exam_score'] ?? MidtermExam::getMidtermExamScore($studentId, $semester, $schoolYear, $classSectionId);
+            $out['midterm_score'] = $mid !== null ? round((float) $mid, 1) : null;
+            if ($ptap !== null && $attendance !== null && $out['midterm_score'] !== null) {
+                $out['semester_score'] = round(($attendance * 0.2) + ($ptap * 0.2) + ($out['midterm_score'] * 0.6), 1);
+            }
+            return $out;
+        }
+
+        if (strcasecmp($semester, 'Spring') === 0) {
+            $fin = $scores['final_exam_score'] ?? FinalExam::getFinalExamScore($studentId, $semester, $schoolYear, $classSectionId);
+            $out['final_score'] = $fin !== null ? round((float) $fin, 1) : null;
+            if ($ptap !== null && $attendance !== null && $out['final_score'] !== null) {
+                $out['semester_score'] = round(($attendance * 0.2) + ($ptap * 0.2) + ($out['final_score'] * 0.6), 1);
+            }
+            return $out;
+        }
+
+        return $out;
+    }
+
+    private function saveStudentScores(
+        int $studentId,
+        string $schoolId,
+        int $classSectionId,
+        ?int $updatedBy,
+        string $semester,
+        string $schoolYear,
+        array $scoreData
+    ): void {
+        $payload = array_merge([
+            'student_id' => $studentId,
+            'school_id' => $schoolId,
+            'class_section_id' => $classSectionId,
+            'semester' => $semester,
+            'school_year' => $schoolYear,
+            'updated_at' => now(),
+        ], $scoreData);
+
+        if ($updatedBy !== null) {
+            $payload['updated_by'] = $updatedBy;
+        }
+
+        SemesterScore::upsertScore($payload);
+    }
+}
diff --git a/app/Services/SemesterRangeService.php b/app/Services/SemesterRangeService.php
new file mode 100644
index 00000000..6247ccf1
--- /dev/null
+++ b/app/Services/SemesterRangeService.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Services;
+
+use App\Services\Semesters\SemesterConfigService;
+use DateTimeImmutable;
+
+class SemesterRangeService
+{
+    public function __construct(private SemesterConfigService $configService)
+    {
+    }
+
+    public function getSchoolYearRange(string $schoolYear): array
+    {
+        $start = $this->configService->getFallStart();
+        $end = $this->configService->getLastSchoolDay();
+
+        if ($start === null || $end === null) {
+            [$fallbackStart, $fallbackEnd] = $this->fallbackSchoolYearRange($schoolYear);
+            $start ??= $fallbackStart;
+            $end ??= $fallbackEnd;
+        }
+
+        if ($end < $start) {
+            [$start, $end] = [$end, $start];
+        }
+
+        return [$start->format('Y-m-d'), $end->format('Y-m-d')];
+    }
+
+    public function getSemesterRange(string $schoolYear, string $semester): ?array
+    {
+        if (!preg_match('/^(\\d{4})-(\\d{4})$/', $schoolYear, $m)) {
+            return null;
+        }
+        $y1 = (int) $m[1];
+        $y2 = (int) $m[2];
+
+        $normalized = ucfirst(strtolower(trim($semester)));
+        if ($normalized === 'Fall') {
+            return [sprintf('%04d-09-21', $y1), sprintf('%04d-01-18', $y2)];
+        }
+        if ($normalized === 'Spring') {
+            return [sprintf('%04d-01-25', $y2), sprintf('%04d-05-31', $y2)];
+        }
+
+        return null;
+    }
+
+    public function normalizeSemester(?string $semester): string
+    {
+        $value = strtolower(trim((string) ($semester ?? '')));
+        if ($value === 'fall') {
+            return 'Fall';
+        }
+        if ($value === 'spring') {
+            return 'Spring';
+        }
+        return '';
+    }
+
+    public function getSemesterForDate(?string $date = null): string
+    {
+        $fallStart = $this->configService->getFallStart();
+        $springStart = $this->configService->getSpringStart();
+        $lastDay = $this->configService->getLastSchoolDay();
+
+        try {
+            $target = new DateTimeImmutable($date ?: 'now');
+        } catch (\Throwable) {
+            return '';
+        }
+
+        if ($fallStart === null || $springStart === null || $lastDay === null) {
+            return '';
+        }
+
+        $target = $target->setTime(0, 0, 0);
+        $fallStart = $fallStart->setTime(0, 0, 0);
+        $springStart = $springStart->setTime(0, 0, 0);
+        $lastDay = $lastDay->setTime(0, 0, 0);
+
+        $nextFallStart = $fallStart <= $lastDay ? $fallStart->modify('+1 year') : $fallStart;
+
+        if (($fallStart <= $target && $target < $springStart)
+            || ($lastDay <= $target && $target < $nextFallStart)
+        ) {
+            return 'Fall';
+        }
+
+        if ($springStart <= $target && $target < $lastDay) {
+            return 'Spring';
+        }
+
+        return '';
+    }
+
+    private function fallbackSchoolYearRange(string $schoolYear): array
+    {
+        if (preg_match('/^(\\d{4})-(\\d{4})$/', $schoolYear, $m)) {
+            $y1 = (int) $m[1];
+            $y2 = (int) $m[2];
+            return [new DateTimeImmutable($y1 . '-09-01'), new DateTimeImmutable($y2 . '-06-30')];
+        }
+
+        $currentYear = (int) date('Y');
+        return [
+            new DateTimeImmutable($currentYear . '-09-01'),
+            new DateTimeImmutable(($currentYear + 1) . '-06-30'),
+        ];
+    }
+}
diff --git a/app/Services/Semesters/SemesterConfigService.php b/app/Services/Semesters/SemesterConfigService.php
new file mode 100644
index 00000000..574c01e3
--- /dev/null
+++ b/app/Services/Semesters/SemesterConfigService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services\Semesters;
+
+use App\Models\Configuration;
+use DateTimeImmutable;
+
+class SemesterConfigService
+{
+    public function getFallStart(): ?DateTimeImmutable
+    {
+        return $this->parseDate(Configuration::getConfigValueByKey('fall_semester_start'));
+    }
+
+    public function getSpringStart(): ?DateTimeImmutable
+    {
+        return $this->parseDate(Configuration::getConfigValueByKey('spring_semester_start'));
+    }
+
+    public function getLastSchoolDay(): ?DateTimeImmutable
+    {
+        $value = Configuration::getConfigValueByKey('last_school_day')
+            ?? Configuration::getConfigValueByKey('last_day_of_school');
+
+        return $this->parseDate($value);
+    }
+
+    private function parseDate(?string $value): ?DateTimeImmutable
+    {
+        $value = (string) ($value ?? '');
+        if ($value === '') {
+            return null;
+        }
+
+        try {
+            return new DateTimeImmutable($value);
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+}
diff --git a/app/Services/Users/LoginActivityService.php b/app/Services/Users/LoginActivityService.php
new file mode 100644
index 00000000..1c62b4f9
--- /dev/null
+++ b/app/Services/Users/LoginActivityService.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Services\Users;
+
+use App\Models\LoginActivity;
+
+class LoginActivityService
+{
+    public function list(int $perPage, int $page): array
+    {
+        $perPage = max(1, min($perPage, 200));
+        $page = max(1, $page);
+
+        $total = (int) LoginActivity::query()->count();
+        $pageCount = (int) max(1, ceil($total / $perPage));
+
+        $activities = LoginActivity::query()
+            ->orderByDesc('login_time')
+            ->forPage($page, $perPage)
+            ->get();
+
+        $normalized = $activities->map(static function (LoginActivity $activity) {
+            return [
+                'user_id' => $activity->user_id,
+                'email' => $activity->email,
+                'login_time' => optional($activity->login_time)->toDateTimeString(),
+                'logout_time' => optional($activity->logout_time)->toDateTimeString(),
+                'ip_address' => $activity->ip_address,
+                'user_agent' => $activity->user_agent,
+            ];
+        })->all();
+
+        return [
+            'activities' => $normalized,
+            'pagination' => [
+                'total' => $total,
+                'perPage' => $perPage,
+                'currentPage' => $page,
+                'pageCount' => $pageCount,
+                'hasNext' => $page < $pageCount,
+                'hasPrevious' => $page > 1,
+            ],
+        ];
+    }
+}
diff --git a/app/Services/Users/UserEventService.php b/app/Services/Users/UserEventService.php
new file mode 100644
index 00000000..d3c706ef
--- /dev/null
+++ b/app/Services/Users/UserEventService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Services\Users;
+
+use App\Services\EmailService;
+use Illuminate\Support\Facades\Log;
+
+class UserEventService
+{
+    public function __construct(private EmailService $emailService)
+    {
+    }
+
+    public function handleNewAccountAdded(array $userData): bool
+    {
+        $email = (string) ($userData['email'] ?? '');
+        if ($email === '') {
+            Log::warning('UserEventService: missing email for welcome message.');
+            return false;
+        }
+
+        $name = trim((string) (($userData['firstname'] ?? '') . ' ' . ($userData['lastname'] ?? '')));
+        $safeName = e($name !== '' ? $name : 'there');
+
+        $subject = 'Welcome to Al Rahma Sunday School!';
+        $message = '<p>Hello ' . $safeName . ',</p>'
+            . '<p>Your account has been created. Welcome to Al Rahma Sunday School.</p>';
+
+        return $this->emailService->send($email, $subject, $message, 'registration');
+    }
+}
diff --git a/app/Services/Users/UserListService.php b/app/Services/Users/UserListService.php
new file mode 100644
index 00000000..918773cc
--- /dev/null
+++ b/app/Services/Users/UserListService.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace App\Services\Users;
+
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class UserListService
+{
+    private const SORT_FIELDS = [
+        'id',
+        'firstname',
+        'lastname',
+        'email',
+        'status',
+        'updated_at',
+    ];
+
+    public function list(?string $sort, ?string $order): array
+    {
+        $sort = in_array($sort, self::SORT_FIELDS, true) ? $sort : 'id';
+        $order = strtolower((string) $order) === 'desc' ? 'desc' : 'asc';
+
+        $users = User::query()
+            ->with('roles')
+            ->orderBy($sort, $order)
+            ->get();
+
+        $guardianMap = $this->guardianTypeMap();
+        [$secondByUserId, $secondByEmail] = $this->secondParentMaps();
+
+        $usersWithRoles = [];
+
+        foreach ($users as $user) {
+            $roles = $user->roles->map(fn ($role) => (string) $role->name)->values()->all();
+            $roleIds = $user->roles->map(fn ($role) => (int) $role->id)->values()->all();
+
+            $userId = (int) $user->id;
+            $parentType = $guardianMap[$userId] ?? '';
+
+            $isSecond = false;
+            if ($userId > 0 && !empty($secondByUserId[$userId])) {
+                $isSecond = true;
+            } else {
+                $email = trim(strtolower((string) $user->email));
+                if ($email !== '' && !empty($secondByEmail[$email])) {
+                    $isSecond = true;
+                }
+            }
+
+            $usersWithRoles[] = [
+                'user' => $user->toArray(),
+                'roles' => $roles,
+                'role_ids' => $roleIds,
+                'parent_type' => $parentType,
+                'second_from_parents' => $isSecond ? 'Yes' : '',
+            ];
+        }
+
+        return $usersWithRoles;
+    }
+
+    public function getUsersWithRoles(?string $sort = 'id', ?string $order = 'asc'): array
+    {
+        $sort = (string) ($sort ?? 'id');
+        $order = (string) ($order ?? 'asc');
+
+        $map = [
+            'id' => 'users.id',
+            'firstname' => 'users.firstname',
+            'lastname' => 'users.lastname',
+            'email' => 'users.email',
+            'role' => 'role',
+        ];
+
+        $sortField = $map[$sort] ?? 'users.id';
+
+        return User::getUsersWithRoles($sortField, $order);
+    }
+
+    public function getUnverifiedUsers(): array
+    {
+        return User::getUnverifiedUsers();
+    }
+
+    public function getUsersByRole(string $role): array
+    {
+        return User::getUsersByRole($role);
+    }
+
+    private function guardianTypeMap(): array
+    {
+        if (!Schema::hasTable('family_guardians')) {
+            return [];
+        }
+
+        $rows = DB::table('family_guardians')
+            ->selectRaw('user_id, MAX(is_primary) AS max_primary, COUNT(*) AS cnt')
+            ->groupBy('user_id')
+            ->get();
+
+        $map = [];
+        foreach ($rows as $row) {
+            $userId = (int) ($row->user_id ?? 0);
+            if ($userId <= 0) {
+                continue;
+            }
+            $count = (int) ($row->cnt ?? 0);
+            if ($count <= 0) {
+                continue;
+            }
+            $maxPrimary = (int) ($row->max_primary ?? 0);
+            $map[$userId] = $maxPrimary > 0 ? 'Primary' : 'Secondary';
+        }
+
+        return $map;
+    }
+
+    private function secondParentMaps(): array
+    {
+        if (!Schema::hasTable('parents')) {
+            return [[], []];
+        }
+
+        $byUserId = [];
+        $byEmail = [];
+
+        if (Schema::hasColumn('parents', 'secondparent_user_id')) {
+            $rows = DB::table('parents')
+                ->selectRaw('secondparent_user_id AS uid, COUNT(*) AS cnt')
+                ->where('secondparent_user_id', '!=', 0)
+                ->groupBy('secondparent_user_id')
+                ->get();
+
+            foreach ($rows as $row) {
+                $userId = (int) ($row->uid ?? 0);
+                if ($userId > 0) {
+                    $byUserId[$userId] = true;
+                }
+            }
+        }
+
+        if (Schema::hasColumn('parents', 'secondparent_email')) {
+            $rows = DB::table('parents')
+                ->selectRaw('LOWER(TRIM(secondparent_email)) AS em, COUNT(*) AS cnt')
+                ->where('secondparent_email', '!=', '')
+                ->groupBy('secondparent_email')
+                ->get();
+
+            foreach ($rows as $row) {
+                $email = trim(strtolower((string) ($row->em ?? '')));
+                if ($email !== '') {
+                    $byEmail[$email] = true;
+                }
+            }
+        }
+
+        return [$byUserId, $byEmail];
+    }
+}
diff --git a/app/Services/Users/UserManagementService.php b/app/Services/Users/UserManagementService.php
new file mode 100644
index 00000000..f7aaa4e7
--- /dev/null
+++ b/app/Services/Users/UserManagementService.php
@@ -0,0 +1,293 @@
+<?php
+
+namespace App\Services\Users;
+
+use App\Models\Role;
+use App\Models\User;
+use App\Models\UserRole;
+use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+
+class UserManagementService
+{
+    public function __construct(private UserEventService $eventService)
+    {
+    }
+
+    public function create(array $payload, ?int $actorId = null): array
+    {
+        $actorId = $actorId ?? (auth()->id() ?? null);
+
+        try {
+            $user = DB::transaction(function () use ($payload, $actorId) {
+                $data = $this->normalizeForCreate($payload);
+                $user = User::query()->create($data);
+
+                UserRole::query()->create([
+                    'user_id' => $user->id,
+                    'role_id' => (int) $payload['role_id'],
+                    'updated_by' => $actorId,
+                ]);
+
+                return $user;
+            });
+        } catch (\Throwable $e) {
+            return ['ok' => false, 'message' => 'Failed to create user.'];
+        }
+
+        $this->eventService->handleNewAccountAdded($user->toArray());
+
+        return ['ok' => true, 'user' => $user];
+    }
+
+    public function update(int $userId, array $payload): array
+    {
+        $user = User::query()->find($userId);
+        if (!$user) {
+            return ['ok' => false, 'message' => 'User not found.'];
+        }
+
+        $data = $this->normalizeForUpdate($payload);
+        if (empty($data)) {
+            return ['ok' => false, 'message' => 'No changes requested.'];
+        }
+
+        try {
+            $user->fill($data);
+            $user->save();
+        } catch (\Throwable $e) {
+            return ['ok' => false, 'message' => 'Failed to update user.'];
+        }
+
+        return ['ok' => true, 'user' => $user];
+    }
+
+    public function delete(int $userId): array
+    {
+        $user = User::query()->find($userId);
+        if (!$user) {
+            return ['ok' => false, 'message' => 'User not found.'];
+        }
+
+        try {
+            DB::transaction(function () use ($userId, $user) {
+                UserRole::query()->where('user_id', $userId)->delete();
+                $user->delete();
+            });
+        } catch (\Throwable $e) {
+            return ['ok' => false, 'message' => 'Failed to delete user.'];
+        }
+
+        return ['ok' => true];
+    }
+
+    public function assignRole(int $userId, int $roleId, ?int $actorId = null): bool
+    {
+        $actorId = $actorId ?? (auth()->id() ?? null);
+
+        if (!User::query()->whereKey($userId)->exists()) {
+            return false;
+        }
+
+        if (!Role::query()->whereKey($roleId)->exists()) {
+            return false;
+        }
+
+        return UserRole::updateOrInsertRole($userId, $roleId, $actorId);
+    }
+
+    public function cleanupUnverifiedUsers(int $olderThanMinutes = 15): int
+    {
+        $cutoff = now()->subMinutes(max(1, $olderThanMinutes));
+
+        $deleted = User::query()
+            ->where('is_verified', 0)
+            ->where('created_at', '<=', $cutoff)
+            ->delete();
+
+        Log::info(sprintf(
+            'Deleted %d unverified users created before %s.',
+            $deleted,
+            $cutoff->format('Y-m-d H:i:s')
+        ));
+
+        return $deleted;
+    }
+
+    public function validateRegistrationInput(array $data): array
+    {
+        $rules = [
+            'firstname' => ['required', 'regex:/^[a-zA-Z\\s-]+$/', 'min:2', 'max:30'],
+            'lastname' => ['required', 'regex:/^[a-zA-Z\\s-]+$/', 'min:2', 'max:30'],
+            'gender' => ['required', 'in:Male,Female'],
+            'email' => ['required', 'email', 'max:50'],
+            'confirm_email' => ['required', 'same:email'],
+            'cellphone' => ['required', 'regex:/^[\\d\\s\\-\\(\\)\\.]+$/', 'min:10', 'max:20'],
+            'address_street' => ['nullable', 'regex:/^[a-zA-Z0-9\\s\\-]+$/', 'max:150'],
+            'apt' => ['nullable', 'regex:/^[a-zA-Z0-9\\s-]+$/', 'max:10'],
+            'city' => ['required', 'regex:/^[a-zA-Z\\s]+$/', 'min:2', 'max:30'],
+            'state' => ['required', 'in:CT,ME,MA,NH,NY,RI,VT'],
+            'zip' => ['required', 'regex:/^\\d{5}$/'],
+            'accept_school_policy' => ['required'],
+        ];
+
+        $isParent = !empty($data['is_parent']);
+        $noSecondParent = !empty($data['no_second_parent_info']);
+
+        if ($isParent && !$noSecondParent) {
+            $rules += [
+                'second_firstname' => ['required', 'regex:/^[a-zA-Z\\s\\-]+$/', 'min:2', 'max:30'],
+                'second_lastname' => ['required', 'regex:/^[a-zA-Z\\s\\-]+$/', 'min:2', 'max:30'],
+                'second_gender' => ['required', 'in:Male,Female'],
+                'second_email' => ['required', 'email', 'max:50'],
+                'second_cellphone' => ['required', 'regex:/^[\\d\\s\\-\\(\\)\\.]+$/', 'min:10', 'max:20'],
+            ];
+        }
+
+        $validator = Validator::make($data, $rules);
+
+        if ($validator->fails()) {
+            return $validator->errors()->toArray();
+        }
+
+        return [];
+    }
+
+    private function normalizeForCreate(array $payload): array
+    {
+        return [
+            'school_id' => $payload['school_id'] ?? null,
+            'firstname' => $this->titleCase($payload['firstname'] ?? ''),
+            'lastname' => $this->titleCase($payload['lastname'] ?? ''),
+            'gender' => $this->normalizeGender($payload['gender'] ?? null),
+            'cellphone' => (string) ($payload['cellphone'] ?? ''),
+            'email' => strtolower((string) ($payload['email'] ?? '')),
+            'address_street' => (string) ($payload['address_street'] ?? ''),
+            'apt' => $payload['apt'] ?? null,
+            'city' => $this->titleCase($payload['city'] ?? ''),
+            'state' => (string) ($payload['state'] ?? ''),
+            'zip' => (string) ($payload['zip'] ?? ''),
+            'accept_school_policy' => (bool) ($payload['accept_school_policy'] ?? false),
+            'is_verified' => isset($payload['is_verified']) ? (bool) $payload['is_verified'] : 0,
+            'status' => $payload['status'] ?? 'Inactive',
+            'is_suspended' => isset($payload['is_suspended']) ? (bool) $payload['is_suspended'] : 0,
+            'failed_attempts' => $payload['failed_attempts'] ?? null,
+            'password' => pbkdf2_hash((string) ($payload['password'] ?? '')),
+            'token' => $payload['token'] ?? null,
+            'account_id' => $payload['account_id'] ?? null,
+            'user_type' => $payload['user_type'] ?? 'primary',
+            'semester' => (string) ($payload['semester'] ?? ''),
+            'school_year' => $payload['school_year'] ?? null,
+            'rfid_tag' => $payload['rfid_tag'] ?? null,
+            'last_failed_at' => $this->normalizeDateTime($payload['last_failed_at'] ?? null),
+        ];
+    }
+
+    private function normalizeForUpdate(array $payload): array
+    {
+        $data = [];
+        $map = [
+            'school_id',
+            'firstname',
+            'lastname',
+            'gender',
+            'cellphone',
+            'email',
+            'address_street',
+            'apt',
+            'city',
+            'state',
+            'zip',
+            'accept_school_policy',
+            'user_type',
+            'rfid_tag',
+            'failed_attempts',
+            'last_failed_at',
+            'semester',
+            'school_year',
+            'status',
+            'is_suspended',
+            'is_verified',
+            'token',
+            'account_id',
+        ];
+
+        foreach ($map as $field) {
+            if (!array_key_exists($field, $payload)) {
+                continue;
+            }
+
+            $value = $payload[$field];
+            switch ($field) {
+                case 'firstname':
+                case 'lastname':
+                case 'city':
+                    $data[$field] = $this->titleCase($value);
+                    break;
+                case 'email':
+                    $data[$field] = strtolower((string) $value);
+                    break;
+                case 'gender':
+                    $data[$field] = $this->normalizeGender($value);
+                    break;
+                case 'accept_school_policy':
+                case 'is_suspended':
+                case 'is_verified':
+                    $data[$field] = (bool) $value;
+                    break;
+                case 'last_failed_at':
+                    $data[$field] = $this->normalizeDateTime($value);
+                    break;
+                case 'failed_attempts':
+                case 'school_id':
+                    $data[$field] = $value === '' ? null : $value;
+                    break;
+                default:
+                    $data[$field] = $value;
+                    break;
+            }
+        }
+
+        return $data;
+    }
+
+    private function normalizeGender(?string $value): ?string
+    {
+        $value = strtolower(trim((string) $value));
+        if ($value === '') {
+            return null;
+        }
+        if ($value === 'male') {
+            return 'Male';
+        }
+        if ($value === 'female') {
+            return 'Female';
+        }
+        return null;
+    }
+
+    private function titleCase(?string $value): string
+    {
+        $value = trim((string) $value);
+        if ($value === '') {
+            return '';
+        }
+        return ucfirst($value);
+    }
+
+    private function normalizeDateTime($value): ?string
+    {
+        $value = trim((string) ($value ?? ''));
+        if ($value === '') {
+            return null;
+        }
+
+        try {
+            return CarbonImmutable::parse($value)->format('Y-m-d H:i:s');
+        } catch (\Throwable $e) {
+            return null;
+        }
+    }
+}
diff --git a/app/Support/SqliteCompat.php b/app/Support/SqliteCompat.php
index b9e0dcce..b5fcc5b9 100644
--- a/app/Support/SqliteCompat.php
+++ b/app/Support/SqliteCompat.php
@@ -56,6 +56,7 @@ class SqliteCompat
         // Replace MySQL-specific types.
         $sql = preg_replace('/int\\(\\d+\\)\\s+unsigned/i', 'integer', $sql);
         $sql = preg_replace('/int\\(\\d+\\)/i', 'integer', $sql);
+        $sql = preg_replace('/\\bint\\b/i', 'integer', $sql);
         $sql = preg_replace('/smallint\\(\\d+\\)/i', 'integer', $sql);
         $sql = preg_replace('/tinyint\\(\\d+\\)/i', 'integer', $sql);
         $sql = preg_replace('/decimal\\(\\d+\\s*,\\s*\\d+\\)/i', 'numeric', $sql);
diff --git a/composer.json b/composer.json
index 73e26fb9..dff1b6fe 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
     "require": {
         "php": "^8.2",
         "laravel/framework": "^12.0",
+        "laravel/sanctum": "^4.3",
         "laravel/tinker": "^2.10.1",
         "php-open-source-saver/jwt-auth": "^2.8",
         "setasign/fpdf": "*"
diff --git a/composer.lock b/composer.lock
index 9f20461a..a238a69b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c4518280521bc6de74776cbcc1e35f35",
+    "content-hash": "155e8c52495d21620105d90faabd1d17",
     "packages": [
         {
             "name": "brick/math",
@@ -1333,6 +1333,69 @@
             },
             "time": "2026-02-06T12:17:10+00:00"
         },
+        {
+            "name": "laravel/sanctum",
+            "version": "v4.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/sanctum.git",
+                "reference": "e3b85d6e36ad00e5db2d1dcc27c81ffdf15cbf76"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/e3b85d6e36ad00e5db2d1dcc27c81ffdf15cbf76",
+                "reference": "e3b85d6e36ad00e5db2d1dcc27c81ffdf15cbf76",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "illuminate/console": "^11.0|^12.0|^13.0",
+                "illuminate/contracts": "^11.0|^12.0|^13.0",
+                "illuminate/database": "^11.0|^12.0|^13.0",
+                "illuminate/support": "^11.0|^12.0|^13.0",
+                "php": "^8.2",
+                "symfony/console": "^7.0|^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.6",
+                "orchestra/testbench": "^9.15|^10.8|^11.0",
+                "phpstan/phpstan": "^1.10"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Laravel\\Sanctum\\SanctumServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Sanctum\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Laravel Sanctum provides a featherweight authentication system for SPAs and simple APIs.",
+            "keywords": [
+                "auth",
+                "laravel",
+                "sanctum"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/sanctum/issues",
+                "source": "https://github.com/laravel/sanctum"
+            },
+            "time": "2026-02-07T17:19:31+00:00"
+        },
         {
             "name": "laravel/serializable-closure",
             "version": "v2.0.9",
diff --git a/config/sanctum.php b/config/sanctum.php
new file mode 100644
index 00000000..44527d68
--- /dev/null
+++ b/config/sanctum.php
@@ -0,0 +1,84 @@
+<?php
+
+use Laravel\Sanctum\Sanctum;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Stateful Domains
+    |--------------------------------------------------------------------------
+    |
+    | Requests from the following domains / hosts will receive stateful API
+    | authentication cookies. Typically, these should include your local
+    | and production domains which access your API via a frontend SPA.
+    |
+    */
+
+    'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf(
+        '%s%s',
+        'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1',
+        Sanctum::currentApplicationUrlWithPort(),
+        // Sanctum::currentRequestHost(),
+    ))),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sanctum Guards
+    |--------------------------------------------------------------------------
+    |
+    | This array contains the authentication guards that will be checked when
+    | Sanctum is trying to authenticate a request. If none of these guards
+    | are able to authenticate the request, Sanctum will use the bearer
+    | token that's present on an incoming request for authentication.
+    |
+    */
+
+    'guard' => ['web'],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Expiration Minutes
+    |--------------------------------------------------------------------------
+    |
+    | This value controls the number of minutes until an issued token will be
+    | considered expired. This will override any values set in the token's
+    | "expires_at" attribute, but first-party sessions are not affected.
+    |
+    */
+
+    'expiration' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Token Prefix
+    |--------------------------------------------------------------------------
+    |
+    | Sanctum can prefix new tokens in order to take advantage of numerous
+    | security scanning initiatives maintained by open source platforms
+    | that notify developers if they commit tokens into repositories.
+    |
+    | See: https://docs.github.com/en/code-security/secret-scanning/about-secret-scanning
+    |
+    */
+
+    'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Sanctum Middleware
+    |--------------------------------------------------------------------------
+    |
+    | When authenticating your first-party SPA with Sanctum you may need to
+    | customize some of the middleware Sanctum uses while processing the
+    | request. You may change the middleware listed below as required.
+    |
+    */
+
+    'middleware' => [
+        'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
+        'encrypt_cookies' => Illuminate\Cookie\Middleware\EncryptCookies::class,
+        'validate_csrf_token' => Illuminate\Foundation\Http\Middleware\ValidateCsrfToken::class,
+    ],
+
+];
diff --git a/database/migrations/2026_02_23_204035_create_current_incident_table.php b/database/migrations/2026_02_23_204035_create_current_incident_table.php
new file mode 100644
index 00000000..f039ff4c
--- /dev/null
+++ b/database/migrations/2026_02_23_204035_create_current_incident_table.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        App\Support\SqliteCompat::statement(<<<'SQL'
+CREATE TABLE `current_incident` (
+`id` int UNSIGNED NOT NULL,
+  `student_id` int NOT NULL,
+  `student_name` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
+  `grade` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
+  `incident` enum('payment','attendance','grade','behavior','talking_off_task','calling_out','minor_disruption','minor_dress_code','forgetting_materials','repeated_defiance','disrespectful_tone','minor_profanity','repeated_tardiness','device_misuse','minor_conflict','bullying_harassment','fighting_aggression','threats','theft','vandalism','sexual_harassment','serious_cyber_incident','contraband','weapons_drugs','other') COLLATE utf8mb4_general_ci NOT NULL,
+  `incident_datetime` datetime NOT NULL,
+  `incident_state` enum('Open','Closed','Canceled') COLLATE utf8mb4_general_ci DEFAULT 'Open',
+  `updated_by_open` int DEFAULT NULL,
+  `open_description` text COLLATE utf8mb4_general_ci,
+  `updated_by_closed` int DEFAULT NULL,
+  `close_description` text COLLATE utf8mb4_general_ci,
+  `action_taken` text COLLATE utf8mb4_general_ci,
+  `updated_by_canceled` int DEFAULT NULL,
+  `cancel_description` text COLLATE utf8mb4_general_ci,
+  `semester` varchar(25) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT NULL,
+  `school_year` varchar(9) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL,
+  `created_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+SQL
+        );
+
+        App\Support\SqliteCompat::statement(<<<'SQL'
+ALTER TABLE `current_incident`
+  ADD PRIMARY KEY (`id`);
+SQL
+        );
+
+        App\Support\SqliteCompat::statement(<<<'SQL'
+ALTER TABLE `current_incident`
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
+SQL
+        );
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('current_incident');
+    }
+};
diff --git a/database/migrations/2026_02_23_204036_create_flag_table.php b/database/migrations/2026_02_23_204036_create_incident_table.php
similarity index 67%
rename from database/migrations/2026_02_23_204036_create_flag_table.php
rename to database/migrations/2026_02_23_204036_create_incident_table.php
index 4dde9154..c9272069 100644
--- a/database/migrations/2026_02_23_204036_create_flag_table.php
+++ b/database/migrations/2026_02_23_204036_create_incident_table.php
@@ -9,14 +9,14 @@ return new class extends Migration
     public function up(): void
     {
         App\Support\SqliteCompat::statement(<<<'SQL'
-CREATE TABLE `flag` (
+CREATE TABLE `incident` (
 `id` int UNSIGNED NOT NULL,
   `student_id` int NOT NULL,
   `student_name` varchar(255) COLLATE utf8mb4_general_ci NOT NULL,
   `grade` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
-  `flag` enum('payment','attendance','grade','behavior','talking_off_task','calling_out','minor_disruption','minor_dress_code','forgetting_materials','repeated_defiance','disrespectful_tone','minor_profanity','repeated_tardiness','device_misuse','minor_conflict','bullying_harassment','fighting_aggression','threats','theft','vandalism','sexual_harassment','serious_cyber_incident','contraband','weapons_drugs','other') COLLATE utf8mb4_general_ci NOT NULL,
-  `flag_datetime` datetime NOT NULL,
-  `flag_state` enum('Closed','Canceled') COLLATE utf8mb4_general_ci NOT NULL,
+  `incident` enum('payment','attendance','grade','behavior','talking_off_task','calling_out','minor_disruption','minor_dress_code','forgetting_materials','repeated_defiance','disrespectful_tone','minor_profanity','repeated_tardiness','device_misuse','minor_conflict','bullying_harassment','fighting_aggression','threats','theft','vandalism','sexual_harassment','serious_cyber_incident','contraband','weapons_drugs','other') COLLATE utf8mb4_general_ci NOT NULL,
+  `incident_datetime` datetime NOT NULL,
+  `incident_state` enum('Closed','Canceled') COLLATE utf8mb4_general_ci NOT NULL,
   `updated_by_open` int DEFAULT NULL,
   `open_description` text COLLATE utf8mb4_general_ci,
   `updated_by_closed` int DEFAULT NULL,
@@ -33,13 +33,13 @@ SQL
         );
 
         App\Support\SqliteCompat::statement(<<<'SQL'
-ALTER TABLE `flag`
+ALTER TABLE `incident`
   ADD PRIMARY KEY (`id`);
 SQL
         );
 
         App\Support\SqliteCompat::statement(<<<'SQL'
-ALTER TABLE `flag`
+ALTER TABLE `incident`
   MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
 SQL
         );
@@ -48,6 +48,6 @@ SQL
 
     public function down(): void
     {
-        Schema::dropIfExists('flag');
+        Schema::dropIfExists('incident');
     }
 };
\ No newline at end of file
diff --git a/database/migrations/2026_02_23_900056_create_communication_logs_table.php b/database/migrations/2026_02_23_900056_create_communication_logs_table.php
new file mode 100644
index 00000000..d4083ca4
--- /dev/null
+++ b/database/migrations/2026_02_23_900056_create_communication_logs_table.php
@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        App\Support\SqliteCompat::statement(<<<'SQL'
+CREATE TABLE `communication_logs` (
+`id` int UNSIGNED NOT NULL,
+  `student_id` int UNSIGNED NOT NULL,
+  `family_id` int UNSIGNED NOT NULL,
+  `student_name` varchar(255) DEFAULT NULL,
+  `template_key` varchar(100) DEFAULT NULL,
+  `subject` varchar(255) DEFAULT NULL,
+  `body` mediumtext DEFAULT NULL,
+  `recipients` text DEFAULT NULL,
+  `cc` text DEFAULT NULL,
+  `bcc` text DEFAULT NULL,
+  `attachments` text DEFAULT NULL,
+  `status` varchar(32) DEFAULT NULL,
+  `error_message` text DEFAULT NULL,
+  `sent_by` int UNSIGNED DEFAULT NULL,
+  `metadata` text DEFAULT NULL,
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+SQL
+        );
+
+        App\Support\SqliteCompat::statement(<<<'SQL'
+ALTER TABLE `communication_logs`
+  ADD PRIMARY KEY (`id`),
+  ADD KEY `communication_logs_student_id` (`student_id`),
+  ADD KEY `communication_logs_family_id` (`family_id`),
+  ADD KEY `communication_logs_sent_by` (`sent_by`);
+SQL
+        );
+
+        App\Support\SqliteCompat::statement(<<<'SQL'
+ALTER TABLE `communication_logs`
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT;
+SQL
+        );
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('communication_logs');
+    }
+};
diff --git a/database/migrations/2026_03_09_050312_create_personal_access_tokens_table.php b/database/migrations/2026_03_09_050312_create_personal_access_tokens_table.php
new file mode 100644
index 00000000..40ff706e
--- /dev/null
+++ b/database/migrations/2026_03_09_050312_create_personal_access_tokens_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('personal_access_tokens', function (Blueprint $table) {
+            $table->id();
+            $table->morphs('tokenable');
+            $table->text('name');
+            $table->string('token', 64)->unique();
+            $table->text('abilities')->nullable();
+            $table->timestamp('last_used_at')->nullable();
+            $table->timestamp('expires_at')->nullable()->index();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('personal_access_tokens');
+    }
+};
diff --git a/database/migrations/2026_03_09_064908_create_sessions_table.php b/database/migrations/2026_03_09_064908_create_sessions_table.php
new file mode 100644
index 00000000..f60625bb
--- /dev/null
+++ b/database/migrations/2026_03_09_064908_create_sessions_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('sessions', function (Blueprint $table) {
+            $table->string('id')->primary();
+            $table->foreignId('user_id')->nullable()->index();
+            $table->string('ip_address', 45)->nullable();
+            $table->text('user_agent')->nullable();
+            $table->longText('payload');
+            $table->integer('last_activity')->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('sessions');
+    }
+};
diff --git a/routes/api.php b/routes/api.php
index 7e336996..0933be5e 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -18,15 +18,19 @@ use App\Http\Controllers\Api\Assignment\AssignmentApiController;
 use App\Http\Controllers\Api\Parents\AuthorizedUsersController;
 use App\Http\Controllers\Api\AttendanceTracking\AttendanceTrackingController;
 use App\Http\Controllers\Api\Email\BroadcastEmailController;
-use App\Http\Controllers\Api\Messaging\CommunicationController;
 use App\Http\Controllers\Api\Settings\ConfigurationController;
 use App\Http\Controllers\Api\Staff\ContactController;
-use App\Http\Controllers\Api\Classes\ClassPreparationController;
+use App\Http\Controllers\Api\ClassPreparation\ClassPreparationController;
+use App\Http\Controllers\Api\ClassPrep\ClassPrepController;
 use App\Http\Controllers\Api\Email\EmailController;
 use App\Http\Controllers\Api\Email\EmailExtractorController;
+use App\Http\Controllers\Api\Communication\CommunicationController;
+use App\Http\Controllers\Api\CompetitionScores\CompetitionScoresController;
+use App\Http\Controllers\Api\Discounts\DiscountController;
+use App\Http\Controllers\Api\Expenses\ExpenseController;
+use App\Http\Controllers\Api\ExtraCharges\ExtraChargesController;
 use App\Http\Controllers\Api\Parents\EmergencyContactController;
 use App\Http\Controllers\Api\Settings\EventController;
-use App\Http\Controllers\Api\Finance\ExtraChargesController;
 use App\Http\Controllers\Api\Family\FamilyAdminController;
 use App\Http\Controllers\Api\Family\FamilyController;
 use App\Http\Controllers\Api\Reports\FilesController;
@@ -35,14 +39,15 @@ use App\Http\Controllers\Api\Finance\FinancialController;
 use App\Http\Controllers\Api\System\FlagController;
 use App\Http\Controllers\Api\Scores\GradingController;
 use App\Http\Controllers\Api\System\HealthController;
+use App\Http\Controllers\Api\System\SemesterRangeController;
 use App\Http\Controllers\Api\Scores\HomeworkController;
-use App\Http\Controllers\Api\Scores\HomeworkTrackingController;
 use App\Http\Controllers\Api\Frontend\InfoIconController;
 use App\Http\Controllers\Api\Inventory\InventoryController;
 use App\Http\Controllers\Api\Auth\IpBanController;
 use App\Http\Controllers\Api\Frontend\LandingPageController;
 use App\Http\Controllers\Api\Attendance\LateSlipLogsController;
 use App\Http\Controllers\Api\Messaging\MessagesController;
+use App\Http\Controllers\Api\Incidents\IncidentController as IncidentApiController;
 use App\Http\Controllers\Api\Scores\MidtermController;
 use App\Http\Controllers\Api\System\NavBuilderController;
 use App\Http\Controllers\Api\Notifications\NotificationManagementController;
@@ -57,6 +62,10 @@ use App\Http\Controllers\Api\Finance\PaymentNotificationController;
 use App\Http\Controllers\Api\Finance\PaymentTransactionController;
 use App\Http\Controllers\Api\Finance\PaypalTransactionsController;
 use App\Http\Controllers\Api\Finance\PurchaseOrderController;
+use App\Http\Controllers\Api\Finance\ReimbursementController;
+use App\Http\Controllers\Api\Finance\PaymentEventChargesController;
+use App\Http\Controllers\Api\Finance\PaymentManualController;
+use App\Http\Controllers\Api\Finance\PaypalPaymentController;
 use App\Http\Controllers\Api\Auth\RegisterController;
 use App\Http\Controllers\Api\RolePermissionController;
 use App\Http\Controllers\Api\RoleSwitcherController;
@@ -71,6 +80,16 @@ use App\Http\Controllers\Api\Inventory\SupplierController;
 use App\Http\Controllers\Api\Staff\TeacherController;
 use App\Http\Controllers\Api\StatsController;
 use App\Http\Controllers\Api\Frontend\UiController;
+use App\Http\Controllers\Api\Scores\ProjectController as ProjectScoreController;
+use App\Http\Controllers\Api\Scores\MidtermController as MidtermScoreController;
+use App\Http\Controllers\Api\Scores\FinalController as FinalScoreController;
+use App\Http\Controllers\Api\Scores\QuizController as QuizScoreController;
+use App\Http\Controllers\Api\Scores\HomeworkController as HomeworkScoreController;
+use App\Http\Controllers\Api\Scores\ParticipationController as ParticipationScoreController;
+use App\Http\Controllers\Api\Scores\ScoreController as ScoreDashboardController;
+use App\Http\Controllers\Api\Grading\GradingController as GradingApiController;
+use App\Http\Controllers\Api\Grading\HomeworkTrackingController;
+use App\Http\Controllers\Api\Scores\ScoreCommentController as ScoreCommentApiController;
 use App\Http\Controllers\Api\Messaging\WhatsappController;
 
 use App\Http\Controllers\Api\Attendance\AdminAttendanceApiController;
@@ -79,6 +98,11 @@ use App\Http\Controllers\Api\Attendance\TeacherAttendanceApiController;
 use App\Http\Controllers\Api\Attendance\StaffAttendanceApiController;
 
 Route::prefix('v1')->group(function () {
+    Route::prefix('auth')->group(function () {
+        Route::get('register/captcha', [RegisterController::class, 'captcha']);
+        Route::post('register', [RegisterController::class, 'store']);
+    });
+
     Route::middleware('auth:sanctum')->prefix('administrator')->group(function () {
         Route::get('absence', [AdministratorAbsenceController::class, 'index']);
         Route::post('absence', [AdministratorAbsenceController::class, 'store']);
@@ -139,6 +163,250 @@ Route::prefix('v1')->group(function () {
     Route::middleware('auth:sanctum')->group(function () {
         Route::get('stats', [StatsController::class, 'index']);
 
+        Route::prefix('users')->group(function () {
+            Route::get('/', [UserController::class, 'index']);
+            Route::post('/', [UserController::class, 'store']);
+            Route::get('login-activity', [UserController::class, 'loginActivity']);
+            Route::put('{userId}', [UserController::class, 'update']);
+            Route::delete('{userId}', [UserController::class, 'destroy']);
+        });
+
+        Route::prefix('broadcast-email')->group(function () {
+            Route::get('options', [BroadcastEmailController::class, 'options']);
+            Route::post('send', [BroadcastEmailController::class, 'send']);
+            Route::post('upload-image', [BroadcastEmailController::class, 'uploadImage']);
+        });
+
+        Route::prefix('communications')->group(function () {
+            Route::get('options', [CommunicationController::class, 'options']);
+            Route::get('students/{studentId}/families', [CommunicationController::class, 'families']);
+            Route::get('families/{familyId}/guardians', [CommunicationController::class, 'guardians']);
+            Route::post('preview', [CommunicationController::class, 'preview']);
+            Route::post('send', [CommunicationController::class, 'send']);
+        });
+
+        Route::prefix('competition-scores')->group(function () {
+            Route::get('/', [CompetitionScoresController::class, 'index']);
+            Route::get('{id}', [CompetitionScoresController::class, 'edit']);
+            Route::post('{id}', [CompetitionScoresController::class, 'save']);
+        });
+
+        Route::prefix('discounts')->group(function () {
+            Route::get('options', [DiscountController::class, 'options']);
+            Route::post('apply', [DiscountController::class, 'apply']);
+            Route::get('vouchers', [DiscountController::class, 'listVouchers']);
+            Route::get('vouchers/{id}', [DiscountController::class, 'showVoucher']);
+            Route::post('vouchers', [DiscountController::class, 'storeVoucher']);
+            Route::put('vouchers/{id}', [DiscountController::class, 'updateVoucher']);
+            Route::delete('vouchers/{id}', [DiscountController::class, 'deleteVoucher']);
+        });
+
+        Route::prefix('expenses')->group(function () {
+            Route::get('/', [ExpenseController::class, 'index']);
+            Route::get('options', [ExpenseController::class, 'options']);
+            Route::get('{id}', [ExpenseController::class, 'show']);
+            Route::post('/', [ExpenseController::class, 'store']);
+            Route::put('{id}', [ExpenseController::class, 'update']);
+            Route::post('{id}/status', [ExpenseController::class, 'updateStatus']);
+        });
+
+        Route::prefix('finance')->group(function () {
+            Route::get('financial-report', [FinancialController::class, 'report']);
+            Route::get('financial-summary', [FinancialController::class, 'summary']);
+            Route::get('financial-report/csv', [FinancialController::class, 'downloadCsv']);
+            Route::get('financial-report/pdf', [FinancialController::class, 'downloadPdf']);
+            Route::get('unpaid-parents', [FinancialController::class, 'unpaidParents']);
+
+            Route::prefix('reimbursements')->group(function () {
+                Route::get('under-processing', [ReimbursementController::class, 'underProcessing']);
+                Route::post('mark-donation', [ReimbursementController::class, 'markDonation']);
+                Route::post('batches', [ReimbursementController::class, 'createBatch']);
+                Route::post('batches/assign', [ReimbursementController::class, 'updateBatchAssignment']);
+                Route::post('batches/lock', [ReimbursementController::class, 'lockBatch']);
+                Route::post('batches/admin-files', [ReimbursementController::class, 'uploadBatchAdminFile']);
+                Route::get('batches/admin-files/{name}/{mode?}', [ReimbursementController::class, 'serveAdminCheckFile']);
+                Route::post('batches/email', [ReimbursementController::class, 'sendBatchEmail']);
+                Route::get('export', [ReimbursementController::class, 'export']);
+                Route::get('batches/export', [ReimbursementController::class, 'exportBatch']);
+                Route::get('reimbursed-expenses', [ReimbursementController::class, 'reimbursedExpenses']);
+                Route::get('/', [ReimbursementController::class, 'index']);
+                Route::post('/', [ReimbursementController::class, 'store']);
+                Route::post('process', [ReimbursementController::class, 'process']);
+                Route::put('{id}', [ReimbursementController::class, 'update']);
+            });
+
+            Route::prefix('invoices')->group(function () {
+                Route::get('management', [InvoiceController::class, 'management']);
+                Route::post('generate', [InvoiceController::class, 'generate']);
+                Route::get('parent/{parentId}', [InvoiceController::class, 'byParent']);
+                Route::get('parent-payment', [InvoiceController::class, 'parentPayment']);
+                Route::post('{invoiceId}/status', [InvoiceController::class, 'updateStatus']);
+                Route::get('unpaid', [InvoiceController::class, 'unpaid']);
+                Route::get('{invoiceId}/pdf', [InvoiceController::class, 'pdf']);
+            });
+
+            Route::prefix('payments')->group(function () {
+                Route::post('/', [PaymentController::class, 'store']);
+                Route::get('parent/{parentId}', [PaymentController::class, 'byParent']);
+                Route::post('{paymentId}/balance', [PaymentController::class, 'updateBalance']);
+            });
+
+            Route::prefix('manual-pay')->group(function () {
+                Route::get('search', [PaymentManualController::class, 'search']);
+                Route::get('suggest', [PaymentManualController::class, 'suggest']);
+                Route::post('invoices/{invoiceId}/payments', [PaymentManualController::class, 'record']);
+                Route::put('payments/{paymentId}', [PaymentManualController::class, 'edit']);
+                Route::get('files/{filename}', [PaymentManualController::class, 'file']);
+            });
+
+            Route::prefix('event-charges')->group(function () {
+                Route::get('/', [PaymentEventChargesController::class, 'index']);
+                Route::post('/', [PaymentEventChargesController::class, 'store']);
+                Route::get('parents/{parentId}/students', [PaymentEventChargesController::class, 'enrolledStudents']);
+            });
+
+            Route::prefix('payment-notifications')->group(function () {
+                Route::get('/', [PaymentNotificationController::class, 'index']);
+                Route::post('send', [PaymentNotificationController::class, 'send']);
+            });
+
+            Route::prefix('payment-transactions')->group(function () {
+                Route::post('/', [PaymentTransactionController::class, 'store']);
+                Route::get('payment/{paymentId}', [PaymentTransactionController::class, 'byPayment']);
+                Route::post('{transactionId}/status', [PaymentTransactionController::class, 'updateStatus']);
+            });
+
+            Route::prefix('paypal-transactions')->group(function () {
+                Route::get('/', [PaypalTransactionsController::class, 'index']);
+                Route::get('csv', [PaypalTransactionsController::class, 'downloadCsv']);
+            });
+
+            Route::prefix('paypal')->group(function () {
+                Route::get('redirect', [PaypalPaymentController::class, 'redirect']);
+                Route::post('payments/{paymentId}/create', [PaypalPaymentController::class, 'create']);
+                Route::post('execute', [PaypalPaymentController::class, 'execute']);
+                Route::get('cancel', [PaypalPaymentController::class, 'cancel']);
+            });
+        });
+
+        Route::prefix('files')->group(function () {
+            Route::get('receipts/{name}', [FilesController::class, 'receipt']);
+            Route::get('reimbursements/{name}', [FilesController::class, 'reimb']);
+            Route::get('early-dismissal/{name}', [FilesController::class, 'earlyDismissalSignature']);
+            Route::get('exams/teacher/{name}', [FilesController::class, 'examDraftTeacher']);
+            Route::get('exams/final/{name}', [FilesController::class, 'examDraftFinal']);
+        });
+
+        Route::prefix('system')->group(function () {
+            Route::get('semester-range/school-year', [SemesterRangeController::class, 'schoolYearRange']);
+            Route::get('semester-range/semester', [SemesterRangeController::class, 'semesterRange']);
+            Route::get('semester-range/normalize', [SemesterRangeController::class, 'normalize']);
+            Route::get('semester-range/resolve', [SemesterRangeController::class, 'resolve']);
+        });
+
+        Route::prefix('incidents')->group(function () {
+            Route::get('current', [IncidentApiController::class, 'current']);
+            Route::get('history', [IncidentApiController::class, 'history']);
+            Route::get('processed', [IncidentApiController::class, 'processed']);
+            Route::get('analysis', [IncidentApiController::class, 'analysis']);
+            Route::get('grades/{gradeId}/students', [IncidentApiController::class, 'studentsByGrade']);
+            Route::post('/', [IncidentApiController::class, 'store']);
+            Route::post('{incidentId}/state', [IncidentApiController::class, 'updateState']);
+            Route::post('{incidentId}/close', [IncidentApiController::class, 'close']);
+            Route::post('{incidentId}/cancel', [IncidentApiController::class, 'cancel']);
+        });
+
+        Route::prefix('scores')->group(function () {
+            Route::get('overview', [ScoreDashboardController::class, 'overview']);
+            Route::post('lock', [ScoreDashboardController::class, 'lock']);
+            Route::get('student-scores', [ScoreDashboardController::class, 'studentScores']);
+
+            Route::prefix('projects')->group(function () {
+                Route::get('/', [ProjectScoreController::class, 'index']);
+                Route::post('/', [ProjectScoreController::class, 'update']);
+                Route::post('columns', [ProjectScoreController::class, 'addColumn']);
+            });
+
+            Route::prefix('quizzes')->group(function () {
+                Route::get('/', [QuizScoreController::class, 'index']);
+                Route::post('/', [QuizScoreController::class, 'update']);
+                Route::post('columns', [QuizScoreController::class, 'addColumn']);
+            });
+
+            Route::prefix('homework')->group(function () {
+                Route::get('/', [HomeworkScoreController::class, 'index']);
+                Route::post('/', [HomeworkScoreController::class, 'update']);
+                Route::post('columns', [HomeworkScoreController::class, 'addColumn']);
+            });
+
+            Route::prefix('midterm')->group(function () {
+                Route::get('/', [MidtermScoreController::class, 'index']);
+                Route::post('/', [MidtermScoreController::class, 'update']);
+            });
+
+            Route::prefix('final')->group(function () {
+                Route::get('/', [FinalScoreController::class, 'index']);
+                Route::post('/', [FinalScoreController::class, 'update']);
+            });
+
+            Route::prefix('participation')->group(function () {
+                Route::get('/', [ParticipationScoreController::class, 'index']);
+                Route::post('/', [ParticipationScoreController::class, 'update']);
+            });
+
+            Route::get('predictor', [ScorePredictorController::class, 'index']);
+
+            Route::prefix('comments')->group(function () {
+                Route::get('/', [ScoreCommentApiController::class, 'index']);
+                Route::post('/', [ScoreCommentApiController::class, 'store']);
+                Route::put('/', [ScoreCommentApiController::class, 'update']);
+            });
+        });
+
+        Route::prefix('grading')->group(function () {
+            Route::get('overview', [GradingApiController::class, 'overview']);
+            Route::get('scores/{type}/{classSectionId}/{studentId}', [GradingApiController::class, 'show']);
+            Route::put('scores', [GradingApiController::class, 'update']);
+
+            Route::post('locks/toggle', [GradingApiController::class, 'toggleLock']);
+            Route::post('locks/all', [GradingApiController::class, 'lockAll']);
+            Route::post('refresh', [GradingApiController::class, 'refresh']);
+
+            Route::get('placement', [GradingApiController::class, 'placement']);
+            Route::post('placement/level', [GradingApiController::class, 'updatePlacementLevel']);
+            Route::post('placement/levels', [GradingApiController::class, 'updatePlacementLevels']);
+            Route::post('placement/batch', [GradingApiController::class, 'createPlacementBatch']);
+            Route::get('placement/batch/{batchId}', [GradingApiController::class, 'showPlacementBatch']);
+            Route::put('placement/batch/{batchId}', [GradingApiController::class, 'updatePlacementBatch']);
+
+            Route::get('below-sixty', [GradingApiController::class, 'belowSixty']);
+            Route::get('below-sixty/email', [GradingApiController::class, 'belowSixtyEmail']);
+            Route::post('below-sixty/email', [GradingApiController::class, 'sendBelowSixtyEmail']);
+            Route::post('below-sixty/status', [GradingApiController::class, 'updateBelowSixtyStatus']);
+            Route::get('below-sixty/meeting', [GradingApiController::class, 'belowSixtyMeeting']);
+            Route::post('below-sixty/meeting', [GradingApiController::class, 'saveBelowSixtyMeeting']);
+
+            Route::get('homework-tracking', [HomeworkTrackingController::class, 'index']);
+        });
+
+        Route::prefix('extra-charges')->group(function () {
+            Route::get('/', [ExtraChargesController::class, 'list']);
+            Route::get('options', [ExtraChargesController::class, 'options']);
+            Route::get('parents', [ExtraChargesController::class, 'parentOptions']);
+            Route::get('invoices', [ExtraChargesController::class, 'invoicesForParent']);
+            Route::post('/', [ExtraChargesController::class, 'store']);
+            Route::put('{id}', [ExtraChargesController::class, 'update']);
+            Route::post('{id}/void', [ExtraChargesController::class, 'void']);
+            Route::post('{id}/reverse', [ExtraChargesController::class, 'reverse']);
+        });
+
+        Route::prefix('class-prep')->group(function () {
+            Route::get('/', [ClassPreparationController::class, 'index']);
+            Route::post('mark-printed', [ClassPreparationController::class, 'markPrinted']);
+            Route::get('sticker-counts', [ClassPrepController::class, 'stickerCounts']);
+            Route::get('classes/{classSectionId}/students', [ClassPrepController::class, 'studentsByClass']);
+        });
+
         Route::prefix('badges')->group(function () {
             Route::get('form-data', [BadgeController::class, 'formData']);
             Route::post('pdf', [BadgeController::class, 'generatePdf']);
@@ -182,4 +450,11 @@ Route::middleware('auth:sanctum')->group(function () {
         Route::get('print-status', [BadgeController::class, 'printStatus']);
         Route::post('log-print', [BadgeController::class, 'logPrint']);
     });
+
+    Route::prefix('class-prep')->group(function () {
+        Route::get('/', [ClassPreparationController::class, 'index']);
+        Route::post('mark-printed', [ClassPreparationController::class, 'markPrinted']);
+        Route::get('sticker-counts', [ClassPrepController::class, 'stickerCounts']);
+        Route::get('classes/{classSectionId}/students', [ClassPrepController::class, 'studentsByClass']);
+    });
 });
diff --git a/school_api b/school_api
new file mode 100644
index 00000000..0b7194c9
Binary files /dev/null and b/school_api differ
diff --git a/storage/testing/files/cached.pdf b/storage/testing/files/cached.pdf
new file mode 100644
index 00000000..6fcd80f8
--- /dev/null
+++ b/storage/testing/files/cached.pdf
@@ -0,0 +1 @@
+PDFDATA
\ No newline at end of file
diff --git a/storage/testing/files/sample.exe b/storage/testing/files/sample.exe
new file mode 100644
index 00000000..418d6c38
--- /dev/null
+++ b/storage/testing/files/sample.exe
@@ -0,0 +1 @@
+DATA
\ No newline at end of file
diff --git a/storage/testing/files/sample.pdf b/storage/testing/files/sample.pdf
new file mode 100644
index 00000000..6fcd80f8
--- /dev/null
+++ b/storage/testing/files/sample.pdf
@@ -0,0 +1 @@
+PDFDATA
\ No newline at end of file
diff --git a/tests/Feature/Api/V1/AttendanceTracking/AttendanceTrackingControllerTest.php b/tests/Feature/Api/V1/AttendanceTracking/AttendanceTrackingControllerTest.php
index d36fd988..bfbc9683 100644
--- a/tests/Feature/Api/V1/AttendanceTracking/AttendanceTrackingControllerTest.php
+++ b/tests/Feature/Api/V1/AttendanceTracking/AttendanceTrackingControllerTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Api\V1\AttendanceTracking;
 
-use App\Services\AttendanceTrackingService;
+use App\Services\AttendanceTracking\AttendanceTrackingService;
 use Mockery;
 use Tests\TestCase;
 
@@ -323,4 +323,4 @@ class AttendanceTrackingControllerTest extends TestCase
         $response->assertStatus(422)
             ->assertJsonValidationErrors(['student_id', 'code', 'note']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Feature/Api/V1/Auth/RegisterControllerTest.php b/tests/Feature/Api/V1/Auth/RegisterControllerTest.php
new file mode 100644
index 00000000..7d14bffc
--- /dev/null
+++ b/tests/Feature/Api/V1/Auth/RegisterControllerTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Auth;
+
+use App\Models\Role;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
+use Tests\TestCase;
+
+class RegisterControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_captcha_endpoint_returns_value(): void
+    {
+        $response = $this->getJson('/api/v1/auth/register/captcha');
+
+        $response->assertOk();
+        $response->assertJsonStructure(['ok', 'captcha']);
+        $this->assertNotEmpty($response->json('captcha'));
+    }
+
+    public function test_register_creates_user(): void
+    {
+        Mail::fake();
+
+        DB::table('configuration')->insert([
+            ['id' => 2001, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2002, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        Role::query()->create([
+            'id' => 1,
+            'name' => 'parent',
+            'slug' => 'parent',
+            'description' => 'Parent',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        $payload = [
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'gender' => 'Male',
+            'email' => 'parent@example.com',
+            'confirm_email' => 'parent@example.com',
+            'cellphone' => '5555555555',
+            'address_street' => '123 Main',
+            'apt' => 'A',
+            'city' => 'City',
+            'state' => 'CT',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'captcha' => 'ABCD',
+            'is_parent' => 1,
+            'no_second_parent_info' => 1,
+        ];
+
+        $response = $this->withSession(['captcha_answer' => 'ABCD'])
+            ->postJson('/api/v1/auth/register', $payload);
+
+        $response->assertCreated();
+        $response->assertJsonPath('ok', true);
+
+        $this->assertDatabaseHas('users', [
+            'email' => 'parent@example.com',
+            'status' => 'Inactive',
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Auth/RegisterPayloadDebugTest.php b/tests/Feature/Api/V1/Auth/RegisterPayloadDebugTest.php
new file mode 100644
index 00000000..d6081d22
--- /dev/null
+++ b/tests/Feature/Api/V1/Auth/RegisterPayloadDebugTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Auth;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class RegisterPayloadDebugTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_debug_payload_shows_json_body(): void
+    {
+        $payload = [
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'gender' => 'Male',
+            'email' => 'parent@example.com',
+            'confirm_email' => 'parent@example.com',
+            'cellphone' => '5555555555',
+            'address_street' => '123 Main',
+            'apt' => 'A',
+            'city' => 'City',
+            'state' => 'CT',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'captcha' => 'ABCD',
+            'is_parent' => 1,
+            'no_second_parent_info' => 1,
+        ];
+
+        $response = $this->withHeaders(['X-Debug-Request' => '1'])
+            ->postJson('/api/v1/auth/register', $payload);
+
+        $response->assertOk();
+        $response->assertJsonPath('ok', true);
+        $response->assertJsonFragment(['email' => 'parent@example.com']);
+        $response->assertJsonPath('debug.json_all.email', 'parent@example.com');
+    }
+}
diff --git a/tests/Feature/Api/V1/BroadcastEmail/BroadcastEmailControllerTest.php b/tests/Feature/Api/V1/BroadcastEmail/BroadcastEmailControllerTest.php
new file mode 100644
index 00000000..33ddaf1a
--- /dev/null
+++ b/tests/Feature/Api/V1/BroadcastEmail/BroadcastEmailControllerTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Tests\Feature\Api\V1\BroadcastEmail;
+
+use App\Models\User;
+use App\Services\EmailService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class BroadcastEmailControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_options_returns_parents_and_senders(): void
+    {
+        $this->seedParentData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/broadcast-email/options');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('parents'));
+        $this->assertNotEmpty($response->json('fromOptions'));
+    }
+
+    public function test_send_test_only_dispatches_email(): void
+    {
+        $this->seedParentData();
+
+        $fake = new class extends EmailService {
+            public array $sent = [];
+
+            public function send(
+                array|string $to,
+                string $subject,
+                string $html,
+                string $fromKey = 'general',
+                array $cc = [],
+                array $bcc = []
+            ): bool
+            {
+                $this->sent[] = compact('to', 'subject', 'html', 'fromKey', 'cc', 'bcc');
+                return true;
+            }
+        };
+
+        $this->app->instance(EmailService::class, $fake);
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/broadcast-email/send', [
+            'mode' => 'personalized',
+            'subject' => 'Test Subject',
+            'from_key' => 'general',
+            'body_html' => '<p>Hello {{name}}</p>',
+            'send_test_only' => true,
+            'test_email' => 'parent@example.com',
+            'wrap_layout' => false,
+        ]);
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+        ]);
+        $this->assertCount(1, $fake->sent);
+    }
+
+    private function seedParentData(): void
+    {
+        DB::table('roles')->insert([
+            'id' => 1,
+            'name' => 'parent',
+            'slug' => 'parent',
+            'is_active' => 1,
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 10,
+            'role_id' => 1,
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/ClassPrep/ClassPrepControllerTest.php b/tests/Feature/Api/V1/ClassPrep/ClassPrepControllerTest.php
new file mode 100644
index 00000000..db9c7103
--- /dev/null
+++ b/tests/Feature/Api/V1/ClassPrep/ClassPrepControllerTest.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Tests\Feature\Api\V1\ClassPrep;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ClassPrepControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_sticker_counts_returns_payload(): void
+    {
+        $this->seedStickerData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/class-prep/sticker-counts?school_year=2025-2026&semester=Fall');
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+            'data' => [
+                'totals' => [
+                    'primary' => 6,
+                    'secondary' => 1,
+                    'students' => 2,
+                ],
+            ],
+        ]);
+    }
+
+    public function test_students_by_class_returns_roster(): void
+    {
+        $this->seedStickerData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/class-prep/classes/101/students?school_year=2025-2026');
+
+        $response->assertOk();
+        $this->assertCount(1, $response->json('students'));
+        $this->assertSame('1-A', $response->json('students.0.registration_grade'));
+    }
+
+    private function seedStickerData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('classes')->insert([
+            [
+                'id' => 1,
+                'class_name' => 'Class 1',
+                'schedule' => 'Sun',
+                'capacity' => 20,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'class_name' => 'Class 2',
+                'schedule' => 'Sun',
+                'capacity' => 20,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 3,
+                'class_name' => 'Class 3',
+                'schedule' => 'Sun',
+                'capacity' => 20,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('classSection')->insert([
+            [
+                'id' => 1,
+                'class_id' => 1,
+                'class_section_id' => 101,
+                'class_section_name' => '1-A',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'class_id' => 2,
+                'class_section_id' => 102,
+                'class_section_name' => '5-B',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 3,
+                'class_id' => 3,
+                'class_section_id' => 103,
+                'class_section_name' => 'Youth-1',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('students')->insert([
+            [
+                'school_id' => 'S-1',
+                'firstname' => 'Student',
+                'lastname' => 'One',
+                'age' => 8,
+                'gender' => 'Male',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+                'is_new' => 0,
+            ],
+            [
+                'school_id' => 'S-2',
+                'firstname' => 'Student',
+                'lastname' => 'Two',
+                'age' => 10,
+                'gender' => 'Female',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+                'is_new' => 0,
+            ],
+            [
+                'school_id' => 'S-3',
+                'firstname' => 'Student',
+                'lastname' => 'Three',
+                'age' => 12,
+                'gender' => 'Female',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+                'is_new' => 1,
+            ],
+        ]);
+
+        DB::table('student_class')->insert([
+            [
+                'student_id' => 1,
+                'class_section_id' => 101,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 2,
+                'class_section_id' => 102,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 3,
+                'class_section_id' => 103,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/ClassPreparation/ClassPreparationControllerTest.php b/tests/Feature/Api/V1/ClassPreparation/ClassPreparationControllerTest.php
new file mode 100644
index 00000000..f7b639f4
--- /dev/null
+++ b/tests/Feature/Api/V1/ClassPreparation/ClassPreparationControllerTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Tests\Feature\Api\V1\ClassPreparation;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ClassPreparationControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_prep_payload(): void
+    {
+        $this->seedPrepData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/class-prep?school_year=2025-2026&semester=Fall');
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+            'schoolYear' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+        $this->assertNotEmpty($response->json('results'));
+    }
+
+    public function test_mark_printed_creates_snapshots(): void
+    {
+        $this->seedPrepData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/class-prep/mark-printed', [
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'class_section_ids' => [101],
+        ]);
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+        ]);
+
+        $this->assertDatabaseHas('class_preparation_log', [
+            'class_section_id' => 101,
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    private function seedPrepData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 101,
+            'class_section_name' => '1-A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'school_id' => 'S-1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('inventory_categories')->insert([
+            'type' => 'classroom',
+            'name' => 'Small Table',
+        ]);
+
+        DB::table('inventory_items')->insert([
+            'type' => 'classroom',
+            'category_id' => 1,
+            'name' => 'Small Table',
+            'quantity' => 10,
+            'good_qty' => 10,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Communication/CommunicationControllerTest.php b/tests/Feature/Api/V1/Communication/CommunicationControllerTest.php
new file mode 100644
index 00000000..dddf92bb
--- /dev/null
+++ b/tests/Feature/Api/V1/Communication/CommunicationControllerTest.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Communication;
+
+use App\Models\User;
+use App\Services\EmailService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class CommunicationControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_options_returns_students_and_templates(): void
+    {
+        $this->seedCommunicationData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/communications/options');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('students'));
+        $this->assertNotEmpty($response->json('templates'));
+    }
+
+    public function test_preview_returns_rendered_subject_and_body(): void
+    {
+        $this->seedCommunicationData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/communications/preview', [
+            'template_key' => 'welcome',
+            'student_id' => 1,
+            'family_id' => 1,
+            'vars' => ['custom' => 'value'],
+        ]);
+
+        $response->assertOk();
+        $this->assertStringContainsString('Parent One', (string) $response->json('subject'));
+        $this->assertStringContainsString('Student One', (string) $response->json('html'));
+    }
+
+    public function test_send_dispatches_email(): void
+    {
+        $this->seedCommunicationData();
+
+        $fake = new class extends EmailService {
+            public array $sent = [];
+
+            public function send(
+                array|string $to,
+                string $subject,
+                string $html,
+                string $fromKey = 'general',
+                array $cc = [],
+                array $bcc = []
+            ): bool {
+                $this->sent[] = compact('to', 'subject', 'html', 'fromKey', 'cc', 'bcc');
+                return true;
+            }
+        };
+
+        $this->app->instance(EmailService::class, $fake);
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/communications/send', [
+            'student_id' => 1,
+            'family_id' => 1,
+            'template_key' => 'welcome',
+            'subject' => 'Hello',
+            'body' => '<p>Hi</p>',
+            'recipients' => ['parent1@example.com'],
+            'cc' => ['parent2@example.com'],
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertCount(1, $fake->sent);
+    }
+
+    private function seedCommunicationData(): void
+    {
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S-1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_active' => 1,
+            'is_new' => 0,
+            'registration_grade' => '1-A',
+        ]);
+
+        DB::table('families')->insert([
+            'id' => 1,
+            'family_code' => 'F-1',
+            'household_name' => 'Family One',
+            'is_active' => 1,
+        ]);
+
+        DB::table('family_students')->insert([
+            'family_id' => 1,
+            'student_id' => 1,
+            'is_primary_home' => 1,
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 2,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'parent1@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('family_guardians')->insert([
+            'family_id' => 1,
+            'user_id' => 2,
+            'relation' => 'parent',
+            'is_primary' => 1,
+            'receive_emails' => 1,
+            'receive_sms' => 0,
+        ]);
+
+        DB::table('email_templates')->insert([
+            'id' => 1,
+            'code' => 'welcome',
+            'variant' => 'default',
+            'subject' => 'Hello {{parent_salutation}}',
+            'body_html' => 'Hi {{student_fullname}}',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/CompetitionScores/CompetitionScoresControllerTest.php b/tests/Feature/Api/V1/CompetitionScores/CompetitionScoresControllerTest.php
new file mode 100644
index 00000000..a1c418d9
--- /dev/null
+++ b/tests/Feature/Api/V1/CompetitionScores/CompetitionScoresControllerTest.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Tests\Feature\Api\V1\CompetitionScores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class CompetitionScoresControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_competitions_and_counts(): void
+    {
+        $this->seedCompetitionData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/competition-scores');
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+            'activeClassId' => 101,
+        ]);
+        $this->assertNotEmpty($response->json('competitions'));
+        $this->assertSame(1, $response->json('studentTotal'));
+    }
+
+    public function test_edit_returns_students_and_scores(): void
+    {
+        $this->seedCompetitionData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/competition-scores/1');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('students'));
+        $this->assertSame(5, $response->json('scoreMap.1'));
+        $this->assertSame(20, $response->json('questionCount'));
+    }
+
+    public function test_save_updates_scores(): void
+    {
+        $this->seedCompetitionData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/competition-scores/1', [
+            'class_section_id' => 101,
+            'scores' => [
+                1 => 10,
+            ],
+        ]);
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+        ]);
+
+        $this->assertDatabaseHas('competition_scores', [
+            'competition_id' => 1,
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'score' => 10,
+        ]);
+    }
+
+    private function seedCompetitionData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('classes')->insert([
+            'id' => 1,
+            'class_name' => 'Class 1',
+            'schedule' => 'Sun',
+            'capacity' => 20,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 101,
+            'class_section_name' => '1-A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'class_section_id' => 101,
+            'teacher_id' => 1,
+            'position' => 'main',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S-1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('competitions')->insert([
+            'id' => 1,
+            'title' => 'Quiz',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'class_section_id' => 101,
+            'is_locked' => 0,
+        ]);
+
+        DB::table('competition_class_winners')->insert([
+            'competition_id' => 1,
+            'class_section_id' => 101,
+            'question_count' => 20,
+        ]);
+
+        DB::table('competition_scores')->insert([
+            'competition_id' => 1,
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'score' => 5,
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Discounts/DiscountControllerTest.php b/tests/Feature/Api/V1/Discounts/DiscountControllerTest.php
new file mode 100644
index 00000000..f7f4f07c
--- /dev/null
+++ b/tests/Feature/Api/V1/Discounts/DiscountControllerTest.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Discounts;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class DiscountControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_options_returns_vouchers_and_parents(): void
+    {
+        $this->seedDiscountData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/discounts/options');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('vouchers'));
+        $this->assertNotEmpty($response->json('parents'));
+    }
+
+    public function test_apply_voucher_applies_discount(): void
+    {
+        $this->seedDiscountData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/discounts/apply', [
+            'voucher_id' => 1,
+            'parent_ids' => [10],
+            'allow_additional' => true,
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+
+        $this->assertDatabaseHas('discount_usages', [
+            'voucher_id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+        ]);
+    }
+
+    public function test_store_voucher_creates_row(): void
+    {
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/discounts/vouchers', [
+            'code' => 'NEW-10',
+            'discount_type' => 'percent',
+            'discount_value' => 10,
+            'is_active' => true,
+        ]);
+
+        $response->assertCreated();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('discount_vouchers', ['code' => 'NEW-10']);
+    }
+
+    public function test_show_voucher_returns_resource(): void
+    {
+        $this->seedDiscountData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/discounts/vouchers/1');
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+            'voucher' => [
+                'id' => 1,
+                'code' => 'TEST-100',
+            ],
+        ]);
+    }
+
+    public function test_delete_voucher_removes_row(): void
+    {
+        $this->seedDiscountData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->deleteJson('/api/v1/discounts/vouchers/1');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseMissing('discount_vouchers', ['id' => 1]);
+    }
+
+    private function seedDiscountData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('roles')->insert([
+            'id' => 1,
+            'name' => 'parent',
+            'slug' => 'parent',
+            'is_active' => 1,
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 10,
+            'role_id' => 1,
+        ]);
+
+        DB::table('discount_vouchers')->insert([
+            'id' => 1,
+            'code' => 'TEST-100',
+            'discount_type' => 'fixed',
+            'discount_value' => 100,
+            'max_uses' => 10,
+            'times_used' => 0,
+            'is_active' => 1,
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-1',
+            'total_amount' => 100,
+            'balance' => 100,
+            'paid_amount' => 0,
+            'status' => 'Unpaid',
+            'issue_date' => '2025-09-01',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('enrollments')->insert([
+            'parent_id' => 10,
+            'student_id' => 1,
+            'school_year' => '2025-2026',
+            'enrollment_status' => 'payment pending',
+            'enrollment_date' => '2025-09-01',
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Expenses/ExpenseControllerTest.php b/tests/Feature/Api/V1/Expenses/ExpenseControllerTest.php
new file mode 100644
index 00000000..2471a000
--- /dev/null
+++ b/tests/Feature/Api/V1/Expenses/ExpenseControllerTest.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Expenses;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ExpenseControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_options_returns_staff_and_retailors(): void
+    {
+        $this->seedStaffUsers();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/expenses/options');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('staff'));
+        $this->assertNotEmpty($response->json('retailors'));
+    }
+
+    public function test_store_creates_expense(): void
+    {
+        $this->seedStaffUsers();
+
+        Storage::fake();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $file = UploadedFile::fake()->create('receipt.pdf', 10, 'application/pdf');
+
+        $response = $this->post('/api/v1/expenses', [
+            'category' => 'Expense',
+            'amount' => 25.5,
+            'purchased_by' => 2,
+            'retailor' => 'Amazon',
+            'date_of_purchase' => '2025-09-01',
+            'description' => 'Supplies',
+            'receipt' => $file,
+        ], ['Accept' => 'application/json']);
+
+        $response->assertCreated();
+        $response->assertJson(['ok' => true]);
+
+        $this->assertDatabaseHas('expenses', [
+            'category' => 'Expense',
+            'purchased_by' => 2,
+        ]);
+    }
+
+    public function test_index_lists_expenses(): void
+    {
+        $this->seedExpenseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/expenses');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('expenses'));
+    }
+
+    public function test_show_returns_expense(): void
+    {
+        $this->seedExpenseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/expenses/1');
+
+        $response->assertOk();
+        $response->assertJson([
+            'ok' => true,
+            'expense' => [
+                'id' => 1,
+                'category' => 'Expense',
+            ],
+        ]);
+    }
+
+    public function test_update_status_changes_status(): void
+    {
+        $this->seedExpenseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/expenses/1/status', [
+            'status' => 'approved',
+            'reason' => 'Ok',
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+
+        $this->assertDatabaseHas('expenses', [
+            'id' => 1,
+            'status' => 'approved',
+        ]);
+    }
+
+    private function seedStaffUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'administrator', 'slug' => 'administrator', 'is_active' => 1],
+            ['id' => 2, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            [
+                'id' => 2,
+                'school_id' => 1,
+                'firstname' => 'Staff',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'staff@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 3,
+                'school_id' => 1,
+                'firstname' => 'Parent',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'parent@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 2, 'role_id' => 1],
+            ['user_id' => 3, 'role_id' => 2],
+        ]);
+    }
+
+    private function seedExpenseData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 2,
+            'school_id' => 1,
+            'firstname' => 'Staff',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'staff@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('expenses')->insert([
+            'id' => 1,
+            'category' => 'Expense',
+            'amount' => 10,
+            'date_of_purchase' => '2025-09-01',
+            'purchased_by' => 2,
+            'added_by' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'status' => 'pending',
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/ExtraCharges/ExtraChargesControllerTest.php b/tests/Feature/Api/V1/ExtraCharges/ExtraChargesControllerTest.php
new file mode 100644
index 00000000..7a3d7ef2
--- /dev/null
+++ b/tests/Feature/Api/V1/ExtraCharges/ExtraChargesControllerTest.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace Tests\Feature\Api\V1\ExtraCharges;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ExtraChargesControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_rows(): void
+    {
+        $this->seedBaseData();
+        $this->seedCharge();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/extra-charges');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('rows'));
+    }
+
+    public function test_options_returns_parent_options(): void
+    {
+        $this->seedBaseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/extra-charges/options?q=Parent');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('parents'));
+    }
+
+    public function test_parent_options_returns_results(): void
+    {
+        $this->seedBaseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/extra-charges/parents?q=Parent');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('results'));
+    }
+
+    public function test_invoices_for_parent_returns_results(): void
+    {
+        $this->seedBaseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/extra-charges/invoices?parent_id=10&school_year=2025-2026');
+
+        $response->assertOk();
+        $this->assertNotEmpty($response->json('results'));
+    }
+
+    public function test_store_creates_charge_and_updates_invoice(): void
+    {
+        $this->seedBaseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/extra-charges', [
+            'parent_id' => 10,
+            'title' => 'Books',
+            'amount' => 20,
+            'charge_type' => 'add',
+            'due_date' => '2025-09-01',
+            'invoice_id' => 1,
+            'description' => 'Extra books',
+        ]);
+
+        $response->assertCreated();
+        $response->assertJson(['ok' => true]);
+
+        $this->assertDatabaseHas('additional_charges', [
+            'parent_id' => 10,
+            'title' => 'Books',
+            'status' => 'applied',
+        ]);
+
+        $this->assertDatabaseHas('invoices', [
+            'id' => 1,
+            'total_amount' => 120,
+            'balance' => 120,
+        ]);
+    }
+
+    public function test_update_adjusts_charge(): void
+    {
+        $this->seedBaseData();
+        $this->seedCharge();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->putJson('/api/v1/extra-charges/1', [
+            'title' => 'Books Updated',
+            'amount' => 15,
+            'charge_type' => 'add',
+            'due_date' => '2025-09-01',
+            'description' => 'Updated',
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+
+        $this->assertDatabaseHas('additional_charges', [
+            'id' => 1,
+            'title' => 'Books Updated',
+        ]);
+    }
+
+    public function test_void_changes_status(): void
+    {
+        $this->seedBaseData();
+        $this->seedCharge();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/extra-charges/1/void');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('additional_charges', [
+            'id' => 1,
+            'status' => 'void',
+        ]);
+    }
+
+    public function test_reverse_changes_status(): void
+    {
+        $this->seedBaseData();
+        $this->seedCharge();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/extra-charges/1/reverse');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('additional_charges', [
+            'id' => 1,
+            'status' => 'pending',
+        ]);
+    }
+
+    private function seedBaseData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 10,
+            'role_id' => 1,
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-1',
+            'total_amount' => 100,
+            'balance' => 100,
+            'paid_amount' => 0,
+            'issue_date' => '2025-09-01',
+            'school_year' => '2025-2026',
+            'status' => 'Unpaid',
+        ]);
+    }
+
+    private function seedCharge(): void
+    {
+        DB::table('additional_charges')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'charge_type' => 'add',
+            'title' => 'Books',
+            'description' => 'Extra books',
+            'amount' => 10,
+            'due_date' => '2025-09-01',
+            'status' => 'applied',
+            'created_by' => 1,
+            'created_at' => '2025-09-01 00:00:00',
+        ]);
+
+        DB::table('invoices')->where('id', 1)->update([
+            'total_amount' => 110,
+            'balance' => 110,
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/FinancialControllerTest.php b/tests/Feature/Api/V1/Finance/FinancialControllerTest.php
new file mode 100644
index 00000000..19077ce3
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/FinancialControllerTest.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class FinancialControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_report_returns_financial_report(): void
+    {
+        $this->seedFinancialData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/finance/financial-report?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('report.invoices'));
+    }
+
+    public function test_summary_returns_totals(): void
+    {
+        $this->seedFinancialData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/finance/financial-summary?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertGreaterThan(0, (float) $response->json('summary.totalCharges'));
+    }
+
+    public function test_unpaid_parents_lists_balances(): void
+    {
+        $this->seedFinancialData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/finance/unpaid-parents?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('results'));
+    }
+
+    private function seedFinancialData(): void
+    {
+        DB::table('users')->insert([
+            [
+                'id' => 2,
+                'school_id' => 1,
+                'firstname' => 'Parent',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'parent@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('invoices')->insert([
+            [
+                'id' => 1,
+                'parent_id' => 2,
+                'invoice_number' => 'INV-001',
+                'total_amount' => 100,
+                'balance' => 40,
+                'paid_amount' => 60,
+                'has_discount' => 1,
+                'issue_date' => '2025-01-10',
+                'due_date' => '2025-02-10',
+                'status' => 'unpaid',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'parent_id' => 2,
+                'invoice_number' => 'INV-002',
+                'total_amount' => 50,
+                'balance' => 50,
+                'paid_amount' => 0,
+                'has_discount' => 0,
+                'issue_date' => '2025-02-01',
+                'due_date' => '2025-03-01',
+                'status' => 'unpaid',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 60,
+            'balance' => 40,
+            'number_of_installments' => 1,
+            'payment_method' => 'Cash',
+            'payment_date' => '2025-01-15',
+            'school_year' => '2025-2026',
+            'status' => 'Paid',
+        ]);
+
+        DB::table('discount_usages')->insert([
+            'id' => 1,
+            'voucher_id' => 1,
+            'invoice_id' => 1,
+            'parent_id' => 2,
+            'discount_amount' => 10,
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('refunds')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'school_year' => '2025-2026',
+            'invoice_id' => 1,
+            'refund_amount' => 5,
+            'status' => 'Paid',
+            'refund_paid_amount' => 5,
+        ]);
+
+        DB::table('expenses')->insert([
+            'id' => 1,
+            'category' => 'Expense',
+            'amount' => 20,
+            'date_of_purchase' => '2025-01-05',
+            'purchased_by' => 2,
+            'added_by' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'status' => 'approved',
+        ]);
+
+        DB::table('reimbursements')->insert([
+            'id' => 1,
+            'expense_id' => 1,
+            'amount' => 15,
+            'reimbursed_to' => 2,
+            'added_by' => 1,
+            'status' => 'Paid',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/InvoiceControllerTest.php b/tests/Feature/Api/V1/Finance/InvoiceControllerTest.php
new file mode 100644
index 00000000..3dd376c5
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/InvoiceControllerTest.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class InvoiceControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_management_returns_parent_invoice_data(): void
+    {
+        $this->seedBaseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/finance/invoices/management?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('invoices'));
+    }
+
+    public function test_generate_creates_invoice(): void
+    {
+        $this->seedBaseData(false);
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->postJson('/api/v1/finance/invoices/generate', [
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('invoices', [
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    public function test_by_parent_returns_invoices(): void
+    {
+        $this->seedBaseData();
+
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/finance/invoices/parent/10?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('invoices'));
+    }
+
+    private function seedBaseData(bool $withInvoice = true): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 10,
+            'role_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('enrollments')->insert([
+            'student_id' => 100,
+            'parent_id' => 10,
+            'class_section_id' => 1,
+            'enrollment_status' => 'enrolled',
+            'school_year' => '2025-2026',
+        ]);
+
+        if ($withInvoice) {
+            DB::table('invoices')->insert([
+                'id' => 1,
+                'parent_id' => 10,
+                'invoice_number' => 'INV-001',
+                'total_amount' => 100,
+                'balance' => 100,
+                'paid_amount' => 0,
+                'has_discount' => 0,
+                'issue_date' => '2025-01-10',
+                'status' => 'unpaid',
+                'school_year' => '2025-2026',
+            ]);
+        }
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/PaymentControllerTest.php b/tests/Feature/Api/V1/Finance/PaymentControllerTest.php
new file mode 100644
index 00000000..29ef9aef
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/PaymentControllerTest.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class PaymentControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_store_creates_payment_plan(): void
+    {
+        $this->seedUsers();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/finance/payments', [
+            'parent_id' => 10,
+            'total_amount' => 250,
+            'number_of_installments' => 2,
+            'payment_date' => '2025-01-05',
+            'payment_method' => 'cash',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $response->assertStatus(201);
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('payments', [
+            'parent_id' => 10,
+            'total_amount' => 250,
+            'number_of_installments' => 2,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+
+    public function test_by_parent_returns_payments(): void
+    {
+        $this->seedUsers();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 25,
+            'balance' => 75,
+            'number_of_installments' => 1,
+            'payment_method' => 'cash',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Partially Paid',
+        ]);
+
+        $response = $this->getJson('/api/v1/finance/payments/parent/10?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('payments'));
+    }
+
+    public function test_update_balance_updates_payment(): void
+    {
+        $this->seedUsers();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 0,
+            'balance' => 100,
+            'number_of_installments' => 1,
+            'payment_method' => 'cash',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Pending',
+        ]);
+
+        $response = $this->postJson('/api/v1/finance/payments/1/balance', [
+            'paid_amount' => 25,
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('payments', [
+            'id' => 1,
+            'paid_amount' => 25,
+            'balance' => 75,
+        ]);
+    }
+
+    private function seedUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin', 'slug' => 'admin', 'is_active' => 1],
+            ['id' => 2, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 1, 'role_id' => 1],
+            ['user_id' => 10, 'role_id' => 2],
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/PaymentEventChargesControllerTest.php b/tests/Feature/Api/V1/Finance/PaymentEventChargesControllerTest.php
new file mode 100644
index 00000000..e5a84398
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/PaymentEventChargesControllerTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class PaymentEventChargesControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_store_creates_event_charges(): void
+    {
+        $this->seedUsers();
+        $this->seedStudents();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/finance/event-charges', [
+            'parent_id' => 10,
+            'event_name' => 'Field Trip',
+            'description' => 'Bus fee',
+            'amount' => 25,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'student_ids' => [100],
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('event_charges', [
+            'parent_id' => 10,
+            'student_id' => 100,
+            'event_name' => 'Field Trip',
+            'amount' => 25,
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    private function seedUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin', 'slug' => 'admin', 'is_active' => 1],
+            ['id' => 2, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 1, 'role_id' => 1],
+            ['user_id' => 10, 'role_id' => 2],
+        ]);
+    }
+
+    private function seedStudents(): void
+    {
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/PaymentManualControllerTest.php b/tests/Feature/Api/V1/Finance/PaymentManualControllerTest.php
new file mode 100644
index 00000000..a893d554
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/PaymentManualControllerTest.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class PaymentManualControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_search_returns_parent_data(): void
+    {
+        $this->seedUsers();
+        $this->seedConfig();
+        $this->seedStudent();
+        $this->seedInvoice();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->getJson('/api/v1/finance/manual-pay/search?search_term=parent@example.com');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertSame(10, $response->json('parent.id'));
+    }
+
+    public function test_suggest_returns_items(): void
+    {
+        $this->seedUsers();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->getJson('/api/v1/finance/manual-pay/suggest?q=parent');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('items'));
+    }
+
+    private function seedUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin', 'slug' => 'admin', 'is_active' => 1],
+            ['id' => 2, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 1, 'role_id' => 1],
+            ['user_id' => 10, 'role_id' => 2],
+        ]);
+    }
+
+    private function seedConfig(): void
+    {
+        DB::table('configuration')->insert([
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+            ['config_key' => 'installment_date', 'config_value' => '2025-06-01'],
+        ]);
+    }
+
+    private function seedStudent(): void
+    {
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedInvoice(): void
+    {
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-001',
+            'total_amount' => 100,
+            'balance' => 100,
+            'paid_amount' => 0,
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+            'issue_date' => '2025-01-01',
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/PaymentNotificationControllerTest.php b/tests/Feature/Api/V1/Finance/PaymentNotificationControllerTest.php
new file mode 100644
index 00000000..80e51779
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/PaymentNotificationControllerTest.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Mail;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class PaymentNotificationControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_send_creates_log(): void
+    {
+        Mail::fake();
+        $this->seedUsers();
+        $this->seedConfig();
+        $this->seedInvoice();
+
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/finance/payment-notifications/send', [
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('payment_notification_logs', [
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    public function test_index_lists_logs(): void
+    {
+        $this->seedUsers();
+
+        DB::table('payment_notification_logs')->insert([
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+            'period_year' => 2025,
+            'period_month' => 1,
+            'type' => 'installment',
+            'to_email' => 'parent@example.com',
+            'status' => 'sent',
+            'balance_snapshot' => 100,
+            'sent_at' => '2025-01-01 10:00:00',
+        ]);
+
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->getJson('/api/v1/finance/payment-notifications');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('logs'));
+    }
+
+    private function seedUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin', 'slug' => 'admin', 'is_active' => 1],
+            ['id' => 2, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 1, 'role_id' => 1],
+            ['user_id' => 10, 'role_id' => 2],
+        ]);
+    }
+
+    private function seedConfig(): void
+    {
+        DB::table('configuration')->insert([
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+            ['config_key' => 'installment_date', 'config_value' => '2025-06-01'],
+        ]);
+    }
+
+    private function seedInvoice(): void
+    {
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-001',
+            'total_amount' => 200,
+            'balance' => 200,
+            'paid_amount' => 0,
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+            'issue_date' => '2025-01-01',
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/PaymentTransactionControllerTest.php b/tests/Feature/Api/V1/Finance/PaymentTransactionControllerTest.php
new file mode 100644
index 00000000..036c005f
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/PaymentTransactionControllerTest.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class PaymentTransactionControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_store_creates_transaction(): void
+    {
+        $this->seedUsers();
+        $this->seedPayment();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/finance/payment-transactions', [
+            'transaction_id' => 'TXN-1001',
+            'payment_id' => 1,
+            'transaction_date' => '2025-01-10',
+            'amount' => 25,
+            'payment_method' => 'cash',
+        ]);
+
+        $response->assertStatus(201);
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('payment_transactions', [
+            'transaction_id' => 'TXN-1001',
+            'payment_id' => 1,
+            'amount' => 25,
+        ]);
+    }
+
+    public function test_by_payment_returns_transactions(): void
+    {
+        $this->seedUsers();
+        $this->seedPayment();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('payment_transactions')->insert([
+            'transaction_id' => 'TXN-1002',
+            'payment_id' => 1,
+            'transaction_date' => '2025-01-11',
+            'amount' => 40,
+            'payment_method' => 'cash',
+            'payment_status' => 'Pending',
+        ]);
+
+        $response = $this->getJson('/api/v1/finance/payment-transactions/payment/1');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('transactions'));
+    }
+
+    public function test_update_status_updates_transaction(): void
+    {
+        $this->seedUsers();
+        $this->seedPayment();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('payment_transactions')->insert([
+            'transaction_id' => 'TXN-1003',
+            'payment_id' => 1,
+            'transaction_date' => '2025-01-11',
+            'amount' => 40,
+            'payment_method' => 'cash',
+            'payment_status' => 'Pending',
+        ]);
+
+        $response = $this->postJson('/api/v1/finance/payment-transactions/TXN-1003/status', [
+            'status' => 'Completed',
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('payment_transactions', [
+            'transaction_id' => 'TXN-1003',
+            'payment_status' => 'Completed',
+        ]);
+    }
+
+    private function seedUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin', 'slug' => 'admin', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+    }
+
+    private function seedPayment(): void
+    {
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 0,
+            'balance' => 100,
+            'number_of_installments' => 1,
+            'payment_method' => 'cash',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Pending',
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/PaypalTransactionsControllerTest.php b/tests/Feature/Api/V1/Finance/PaypalTransactionsControllerTest.php
new file mode 100644
index 00000000..1c3ee1c5
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/PaypalTransactionsControllerTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class PaypalTransactionsControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_transactions(): void
+    {
+        $this->seedUsers();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('paypal_payments')->insert([
+            'id' => 1,
+            'transaction_id' => 'PP-1001',
+            'order_id' => 'ORDER-1',
+            'parent_school_id' => 10,
+            'payer_email' => 'payer@example.com',
+            'amount' => 50,
+            'net_amount' => 48,
+            'currency' => 'USD',
+            'status' => 'COMPLETED',
+            'event_type' => 'PAYMENT.SALE.COMPLETED',
+            'created_at' => '2025-01-01 10:00:00',
+        ]);
+
+        $response = $this->getJson('/api/v1/finance/paypal-transactions');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('transactions'));
+    }
+
+    public function test_csv_download(): void
+    {
+        $this->seedUsers();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('paypal_payments')->insert([
+            'id' => 1,
+            'transaction_id' => 'PP-1002',
+            'order_id' => 'ORDER-2',
+            'parent_school_id' => 10,
+            'payer_email' => 'payer@example.com',
+            'amount' => 60,
+            'net_amount' => 58,
+            'currency' => 'USD',
+            'status' => 'COMPLETED',
+            'event_type' => 'PAYMENT.SALE.COMPLETED',
+            'created_at' => '2025-01-01 10:00:00',
+        ]);
+
+        $response = $this->get('/api/v1/finance/paypal-transactions/csv');
+
+        $response->assertOk();
+        $response->assertHeader('Content-Type', 'text/csv');
+    }
+
+    private function seedUsers(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin', 'slug' => 'admin', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Finance/ReimbursementControllerTest.php b/tests/Feature/Api/V1/Finance/ReimbursementControllerTest.php
new file mode 100644
index 00000000..9950f880
--- /dev/null
+++ b/tests/Feature/Api/V1/Finance/ReimbursementControllerTest.php
@@ -0,0 +1,185 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Finance;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ReimbursementControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_batch_creates_open_batch(): void
+    {
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        DB::table('configuration')->insert([
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        $response = $this->postJson('/api/v1/finance/reimbursements/batches', [
+            'title' => 'Test Batch',
+        ]);
+
+        $response->assertCreated();
+        $response->assertJsonPath('ok', true);
+
+        $this->assertDatabaseHas('reimbursement_batches', [
+            'title' => 'Test Batch',
+            'status' => 'open',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+
+    public function test_mark_donation_updates_expense(): void
+    {
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        DB::table('expenses')->insert([
+            'id' => 1,
+            'category' => 'Expense',
+            'amount' => 12.00,
+            'date_of_purchase' => '2025-02-01',
+            'added_by' => $user->id,
+            'purchased_by' => $user->id,
+            'status' => 'approved',
+        ]);
+
+        $response = $this->postJson('/api/v1/finance/reimbursements/mark-donation', [
+            'expense_id' => 1,
+        ]);
+
+        $response->assertOk();
+        $response->assertJsonPath('ok', true);
+
+        $this->assertDatabaseHas('expenses', [
+            'id' => 1,
+            'category' => 'Donation',
+            'status' => 'approved',
+        ]);
+    }
+
+    public function test_store_reimbursement_creates_record_and_updates_expense(): void
+    {
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        DB::table('users')->insert([
+            'id' => 2,
+            'school_id' => 1,
+            'firstname' => 'Recipient',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'recipient@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('expenses')->insert([
+            'id' => 2,
+            'category' => 'Expense',
+            'amount' => 50.00,
+            'date_of_purchase' => '2025-02-05',
+            'added_by' => $user->id,
+            'purchased_by' => $user->id,
+            'status' => 'approved',
+        ]);
+
+        $response = $this->postJson('/api/v1/finance/reimbursements', [
+            'expense_id' => 2,
+            'amount' => 50.00,
+            'reimbursed_to' => 2,
+            'reimbursement_method' => 'Cash',
+            'description' => 'Test reimbursement',
+        ]);
+
+        $response->assertCreated();
+        $response->assertJsonPath('ok', true);
+
+        $this->assertDatabaseHas('reimbursements', [
+            'expense_id' => 2,
+            'amount' => 50.00,
+            'reimbursed_to' => 2,
+            'status' => 'Paid',
+        ]);
+
+        $this->assertDatabaseMissing('expenses', [
+            'id' => 2,
+            'reimbursement_id' => null,
+        ]);
+    }
+
+    public function test_update_reimbursement_updates_fields(): void
+    {
+        $user = $this->createUser();
+        Sanctum::actingAs($user);
+
+        DB::table('reimbursements')->insert([
+            'id' => 10,
+            'amount' => 25.00,
+            'reimbursed_to' => $user->id,
+            'added_by' => $user->id,
+            'status' => 'Paid',
+            'reimbursement_method' => 'Cash',
+        ]);
+
+        $response = $this->putJson('/api/v1/finance/reimbursements/10', [
+            'amount' => 30.00,
+            'reimbursed_to' => $user->id,
+            'reimbursement_method' => 'Cash',
+            'description' => 'Updated',
+        ]);
+
+        $response->assertOk();
+        $response->assertJsonPath('ok', true);
+
+        $this->assertDatabaseHas('reimbursements', [
+            'id' => 10,
+            'amount' => 30.00,
+            'description' => 'Updated',
+        ]);
+    }
+
+    private function createUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Grading/GradingControllerTest.php b/tests/Feature/Api/V1/Grading/GradingControllerTest.php
new file mode 100644
index 00000000..2fa850d1
--- /dev/null
+++ b/tests/Feature/Api/V1/Grading/GradingControllerTest.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Grading;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class GradingControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_overview_returns_grading_data(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->getJson('/api/v1/grading/overview?school_year=2025-2026&semester=Fall&class_id=1');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('grades'));
+    }
+
+    public function test_toggle_lock_locks_section(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/grading/locks/toggle', [
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('grading_locks', [
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'is_locked' => 1,
+        ]);
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+            ['id' => 3, 'config_key' => 'parent_scores_released_fall', 'config_value' => '0'],
+            ['id' => 4, 'config_key' => 'parent_scores_released_spring', 'config_value' => '0'],
+        ]);
+
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'id' => 1,
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('semester_scores')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'school_id' => 1,
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'semester_score' => 88,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Grading/HomeworkTrackingControllerTest.php b/tests/Feature/Api/V1/Grading/HomeworkTrackingControllerTest.php
new file mode 100644
index 00000000..439c5633
--- /dev/null
+++ b/tests/Feature/Api/V1/Grading/HomeworkTrackingControllerTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Grading;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class HomeworkTrackingControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_tracking_payload(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'id' => 1,
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'teacher_id' => 1,
+            'position' => 'main',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->getJson('/api/v1/grading/homework-tracking?school_year=2025-2026&semester=Fall');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('teachers'));
+    }
+}
diff --git a/tests/Feature/Api/V1/Incidents/IncidentControllerTest.php b/tests/Feature/Api/V1/Incidents/IncidentControllerTest.php
new file mode 100644
index 00000000..9f001c79
--- /dev/null
+++ b/tests/Feature/Api/V1/Incidents/IncidentControllerTest.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Incidents;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class IncidentControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_current_returns_incidents_and_grades(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        $user = $this->seedUser();
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 10,
+            'parent_id' => 99,
+            'firstname' => 'Kid',
+            'lastname' => 'Tester',
+            'school_id' => '1',
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => 10,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('current_incident')->insert([
+            'id' => 1,
+            'student_id' => 10,
+            'student_name' => 'Kid Tester',
+            'grade' => '1',
+            'incident' => 'behavior',
+            'incident_datetime' => '2025-01-01 10:00:00',
+            'incident_state' => 'Open',
+            'updated_by_open' => $user->id,
+            'open_description' => 'Initial',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        Sanctum::actingAs($user);
+
+        $response = $this->getJson('/api/v1/incidents/current');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $response->assertJsonCount(1, 'incidents');
+        $response->assertJsonCount(1, 'grades');
+        $response->assertJsonPath('incidents.0.updated_by_open_name', 'Test User');
+    }
+
+    public function test_store_and_close_moves_incident_to_history(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        $user = $this->seedUser();
+
+        DB::table('students')->insert([
+            'id' => 11,
+            'parent_id' => 99,
+            'firstname' => 'Kid',
+            'lastname' => 'Closer',
+            'school_id' => '1',
+            'age' => 11,
+            'gender' => 'F',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        Sanctum::actingAs($user);
+
+        $storeResponse = $this->postJson('/api/v1/incidents', [
+            'student_id' => 11,
+            'grade' => '1',
+            'incident' => 'behavior',
+            'description' => 'Needs attention',
+        ]);
+
+        $storeResponse->assertOk();
+        $storeResponse->assertJson(['ok' => true, 'created' => true]);
+        $currentId = $storeResponse->json('incident_id');
+
+        $closeResponse = $this->postJson('/api/v1/incidents/' . $currentId . '/close', [
+            'state_description' => 'Resolved',
+            'action_taken' => 'Spoke with student',
+        ]);
+
+        $closeResponse->assertOk();
+        $closeResponse->assertJson(['ok' => true]);
+
+        $historyId = $closeResponse->json('incident_id');
+
+        $this->assertDatabaseHas('incident', [
+            'id' => $historyId,
+            'student_id' => 11,
+            'incident_state' => 'Closed',
+        ]);
+        $this->assertDatabaseMissing('current_incident', ['id' => $currentId]);
+    }
+
+    private function seedUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'test@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Reports/FilesControllerTest.php b/tests/Feature/Api/V1/Reports/FilesControllerTest.php
new file mode 100644
index 00000000..978613d2
--- /dev/null
+++ b/tests/Feature/Api/V1/Reports/FilesControllerTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Reports;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class FilesControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_receipt_meta_returns_file_payload(): void
+    {
+        $user = $this->seedUser();
+        Sanctum::actingAs($user);
+
+        $dir = storage_path('uploads/receipts');
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        $path = $dir . DIRECTORY_SEPARATOR . 'sample.pdf';
+        file_put_contents($path, 'PDFDATA');
+
+        $response = $this->getJson('/api/v1/files/receipts/sample.pdf?meta=1');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $response->assertJsonPath('file.name', 'sample.pdf');
+        $response->assertJsonPath('file.size', 7);
+    }
+
+    public function test_exam_draft_teacher_streams_with_download_name(): void
+    {
+        $user = $this->seedUser();
+        Sanctum::actingAs($user);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('exam_drafts')->insert([
+            'id' => 1,
+            'teacher_id' => 1,
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'exam_type' => 'Midterm',
+            'draft_title' => 'Draft',
+            'teacher_file' => 'draft1.pdf',
+            'version' => 2,
+            'status' => 'draft',
+        ]);
+
+        $dir = storage_path('uploads/exams/drafts');
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        $path = $dir . DIRECTORY_SEPARATOR . 'draft1.pdf';
+        file_put_contents($path, 'PDFDATA');
+
+        $response = $this->get('/api/v1/files/exams/teacher/draft1.pdf');
+
+        $response->assertOk();
+        $response->assertHeader('Content-Disposition', 'inline; filename="1a_midterm_v2.pdf"');
+    }
+
+    private function seedUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'test@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/FinalControllerTest.php b/tests/Feature/Api/V1/Scores/FinalControllerTest.php
new file mode 100644
index 00000000..314eb79f
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/FinalControllerTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class FinalControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_final_scores(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('final_exam')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'score' => 90,
+            'semester' => 'Spring',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/final?class_section_id=1&semester=Spring&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Spring',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/HomeworkControllerTest.php b/tests/Feature/Api/V1/Scores/HomeworkControllerTest.php
new file mode 100644
index 00000000..877706e0
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/HomeworkControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class HomeworkControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_homework_scores(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('homework')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'homework_index' => 1,
+            'score' => 90,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/homework?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/MidtermControllerTest.php b/tests/Feature/Api/V1/Scores/MidtermControllerTest.php
new file mode 100644
index 00000000..59a18db7
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/MidtermControllerTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class MidtermControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_midterm_scores(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('midterm_exam')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'score' => 85,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/midterm?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/ParticipationControllerTest.php b/tests/Feature/Api/V1/Scores/ParticipationControllerTest.php
new file mode 100644
index 00000000..b0a7b5e1
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/ParticipationControllerTest.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ParticipationControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_participation_scores(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('participation')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'school_id' => 1,
+            'class_section_id' => 1,
+            'updated_by' => 1,
+            'score' => 93,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/participation?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'id' => 1,
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/ProjectControllerTest.php b/tests/Feature/Api/V1/Scores/ProjectControllerTest.php
new file mode 100644
index 00000000..cf188e50
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/ProjectControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ProjectControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_project_scores(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('project')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'project_index' => 1,
+            'score' => 95,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/projects?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/QuizControllerTest.php b/tests/Feature/Api/V1/Scores/QuizControllerTest.php
new file mode 100644
index 00000000..c1f6e22b
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/QuizControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class QuizControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_quiz_scores(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('quiz')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'quiz_index' => 1,
+            'score' => 88,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/quizzes?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/ScoreCommentControllerTest.php b/tests/Feature/Api/V1/Scores/ScoreCommentControllerTest.php
new file mode 100644
index 00000000..81e2ce21
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/ScoreCommentControllerTest.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ScoreCommentControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_store_rejects_short_comment(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/scores/comments', [
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'comments' => [
+                100 => [
+                    'ptap' => 'Too short',
+                ],
+            ],
+        ]);
+
+        $response->assertStatus(422);
+    }
+
+    public function test_index_returns_comments(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('score_comments')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'score_type' => 'ptap',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'comment' => 'Kid is doing great in class and shows effort and focus in every session.',
+            'commented_by' => 1,
+            'created_at' => now(),
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/comments?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/ScoreControllerTest.php b/tests/Feature/Api/V1/Scores/ScoreControllerTest.php
new file mode 100644
index 00000000..30a16353
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/ScoreControllerTest.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ScoreControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_overview_returns_students(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('teacher_class')->insert([
+            'teacher_id' => 1,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/overview?class_section_id=1&semester=Fall&school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    public function test_lock_creates_grading_lock(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        $response = $this->postJson('/api/v1/scores/lock', [
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'missing_ok' => [],
+        ]);
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertDatabaseHas('grading_locks', [
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'is_locked' => 1,
+        ]);
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+            'semester' => 'Fall',
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/Scores/ScorePredictorControllerTest.php b/tests/Feature/Api/V1/Scores/ScorePredictorControllerTest.php
new file mode 100644
index 00000000..60ab3365
--- /dev/null
+++ b/tests/Feature/Api/V1/Scores/ScorePredictorControllerTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Scores;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class ScorePredictorControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_index_returns_predictions(): void
+    {
+        $this->seedBase();
+        Sanctum::actingAs(User::query()->findOrFail(1));
+
+        DB::table('semester_scores')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'school_id' => 1,
+            'class_section_id' => 1,
+            'semester' => 'spring',
+            'school_year' => '2025-2026',
+            'semester_score' => 90,
+        ]);
+
+        $response = $this->getJson('/api/v1/scores/predictor?school_year=2025-2026&class_section_id=1');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $this->assertNotEmpty($response->json('students'));
+    }
+
+    private function seedBase(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+            ['id' => 3, 'config_key' => 'trophy_score', 'config_value' => '94'],
+            ['id' => 4, 'config_key' => 'pass_score', 'config_value' => '60'],
+        ]);
+
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'teacher', 'slug' => 'teacher', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'id' => 1,
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Feature/Api/V1/System/SemesterRangeControllerTest.php b/tests/Feature/Api/V1/System/SemesterRangeControllerTest.php
new file mode 100644
index 00000000..da2577fc
--- /dev/null
+++ b/tests/Feature/Api/V1/System/SemesterRangeControllerTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Tests\Feature\Api\V1\System;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class SemesterRangeControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_school_year_range_uses_config_dates(): void
+    {
+        $user = $this->seedUser();
+        Sanctum::actingAs($user);
+
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'fall_semester_start', 'config_value' => '2025-09-05'],
+            ['id' => 2, 'config_key' => 'last_school_day', 'config_value' => '2026-06-15'],
+        ]);
+
+        $response = $this->getJson('/api/v1/system/semester-range/school-year?school_year=2025-2026');
+
+        $response->assertOk();
+        $response->assertJsonPath('range.start_date', '2025-09-05');
+        $response->assertJsonPath('range.end_date', '2026-06-15');
+    }
+
+    public function test_resolve_returns_semester_for_date(): void
+    {
+        $user = $this->seedUser();
+        Sanctum::actingAs($user);
+
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'fall_semester_start', 'config_value' => '2025-09-01'],
+            ['id' => 2, 'config_key' => 'spring_semester_start', 'config_value' => '2026-01-20'],
+            ['id' => 3, 'config_key' => 'last_school_day', 'config_value' => '2026-06-01'],
+        ]);
+
+        $response = $this->getJson('/api/v1/system/semester-range/resolve?date=2025-10-01');
+
+        $response->assertOk();
+        $response->assertJsonPath('resolution.semester', 'Fall');
+    }
+
+    private function seedUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'test@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Feature/Api/V1/Users/UserControllerTest.php b/tests/Feature/Api/V1/Users/UserControllerTest.php
new file mode 100644
index 00000000..bb2f1f73
--- /dev/null
+++ b/tests/Feature/Api/V1/Users/UserControllerTest.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Tests\Feature\Api\V1\Users;
+
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class UserControllerTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_user_list_returns_users_with_roles(): void
+    {
+        $admin = $this->seedUser(1, 'admin@example.com');
+        Sanctum::actingAs($admin);
+
+        DB::table('roles')->insert([
+            'id' => 10,
+            'name' => 'Teacher',
+            'slug' => 'teacher',
+            'description' => 'Teacher role',
+            'dashboard_route' => 'teacher/dashboard',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        $this->seedUser(2, 'member@example.com');
+        DB::table('user_roles')->insert([
+            'user_id' => 2,
+            'role_id' => 10,
+        ]);
+
+        $response = $this->getJson('/api/v1/users');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $response->assertJsonFragment(['email' => 'member@example.com']);
+        $response->assertJsonFragment(['roles' => ['Teacher']]);
+    }
+
+    public function test_create_user_creates_user_and_role(): void
+    {
+        $admin = $this->seedUser(1, 'admin@example.com');
+        Sanctum::actingAs($admin);
+
+        DB::table('roles')->insert([
+            'id' => 20,
+            'name' => 'Parent',
+            'slug' => 'parent',
+            'description' => 'Parent role',
+            'dashboard_route' => 'parent/dashboard',
+            'priority' => 2,
+            'is_active' => 1,
+        ]);
+
+        $response = $this->postJson('/api/v1/users', [
+            'firstname' => 'New',
+            'lastname' => 'User',
+            'cellphone' => '5554443333',
+            'email' => 'new.user@example.com',
+            'address_street' => '123 Main St',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => true,
+            'role_id' => 20,
+            'password' => 'secret123',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $response->assertStatus(201);
+        $response->assertJson(['ok' => true]);
+
+        $userId = (int) ($response->json('user_id') ?? 0);
+        $this->assertGreaterThan(0, $userId);
+
+        $this->assertDatabaseHas('users', [
+            'id' => $userId,
+            'email' => 'new.user@example.com',
+        ]);
+
+        $this->assertDatabaseHas('user_roles', [
+            'user_id' => $userId,
+            'role_id' => 20,
+        ]);
+    }
+
+    public function test_login_activity_returns_paginated_results(): void
+    {
+        $admin = $this->seedUser(1, 'admin@example.com');
+        Sanctum::actingAs($admin);
+
+        DB::table('login_activity')->insert([
+            'user_id' => 1,
+            'email' => 'admin@example.com',
+            'login_time' => '2025-01-02 09:00:00',
+            'logout_time' => null,
+            'ip_address' => '10.0.0.1',
+            'user_agent' => 'TestAgent',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('login_activity')->insert([
+            'user_id' => 1,
+            'email' => 'admin@example.com',
+            'login_time' => '2025-01-01 09:00:00',
+            'logout_time' => null,
+            'ip_address' => '10.0.0.2',
+            'user_agent' => 'TestAgent',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $response = $this->getJson('/api/v1/users/login-activity?per_page=1&page=2');
+
+        $response->assertOk();
+        $response->assertJson(['ok' => true]);
+        $response->assertJsonPath('pagination.total', 2);
+        $response->assertJsonPath('pagination.currentPage', 2);
+        $response->assertJsonPath('activities.0.ip_address', '10.0.0.2');
+    }
+
+    private function seedUser(int $id, string $email): User
+    {
+        DB::table('users')->insert([
+            'id' => $id,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => $email,
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail($id);
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdminNotificationSubjectServiceTest.php b/tests/Unit/Services/Administrator/AdminNotificationSubjectServiceTest.php
index a95521e3..aaf4b504 100644
--- a/tests/Unit/Services/Administrator/AdminNotificationSubjectServiceTest.php
+++ b/tests/Unit/Services/Administrator/AdminNotificationSubjectServiceTest.php
@@ -2,120 +2,54 @@
 
 namespace Tests\Unit\Services\Administrator;
 
-use App\Models\AdminNotificationSubject;
 use App\Services\Administrator\AdminNotificationSubjectService;
-use App\Services\Administrator\AdminNotificationUserService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
-use Mockery;
 use Tests\TestCase;
 
 class AdminNotificationSubjectServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_alerts_data_includes_admins(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    public function test_alerts_data_returns_expected_payload_when_table_exists(): void
-    {
-        DB::shouldReceive('getSchemaBuilder->hasTable')
-            ->once()
-            ->with('admin_notification_subjects')
-            ->andReturn(true);
-
-        $userService = Mockery::mock(AdminNotificationUserService::class);
-        $userService->shouldReceive('fetchAdminNotificationUsers')
-            ->once()
-            ->andReturn([
-                ['id' => 1, 'firstname' => 'Admin', 'lastname' => 'One', 'email' => 'a1@test.com'],
-                ['id' => 2, 'firstname' => 'Admin', 'lastname' => 'Two', 'email' => 'a2@test.com'],
-            ]);
-
-        $row1 = (object) ['id' => 10, 'admin_id' => 1, 'subject' => 'academics'];
-        $row2 = (object) ['id' => 11, 'admin_id' => 1, 'subject' => 'finance'];
-        $row3 = (object) ['id' => 12, 'admin_id' => 2, 'subject' => 'general'];
-
-        AdminNotificationSubject::shouldReceive('query->select->whereIn->get')
-            ->once()
-            ->andReturn(collect([$row1, $row2, $row3]));
-
-        $service = new AdminNotificationSubjectService($userService);
-
-        $result = $service->alertsData();
-
-        $this->assertTrue($result['tableReady']);
-        $this->assertCount(2, $result['admins']);
-        $this->assertArrayHasKey('academics', $result['subjects']);
-        $this->assertTrue($result['assignedSubjects'][1]['academics']);
-        $this->assertTrue($result['assignedSubjects'][1]['finance']);
-        $this->assertTrue($result['assignedSubjects'][2]['general']);
-    }
-
-    public function test_save_returns_error_when_table_missing(): void
-    {
-        DB::shouldReceive('getSchemaBuilder->hasTable')
-            ->once()
-            ->with('admin_notification_subjects')
-            ->andReturn(false);
-
-        $userService = Mockery::mock(AdminNotificationUserService::class);
-        $service = new AdminNotificationSubjectService($userService);
-
-        $result = $service->save([
-            1 => ['academics'],
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'Admin', 'slug' => 'admin', 'dashboard_route' => 'admin', 'priority' => 1, 'is_active' => 1],
         ]);
 
-        $this->assertFalse($result['success']);
-        $this->assertSame(422, $result['status']);
-    }
-
-    public function test_save_inserts_and_deletes_subjects(): void
-    {
-        DB::shouldReceive('getSchemaBuilder->hasTable')
-            ->once()
-            ->with('admin_notification_subjects')
-            ->andReturn(true);
-
-        $userService = Mockery::mock(AdminNotificationUserService::class);
-        $userService->shouldReceive('fetchAdminNotificationUsers')
-            ->once()
-            ->andReturn([
-                ['id' => 1, 'firstname' => 'Admin', 'lastname' => 'One', 'email' => 'a1@test.com'],
-                ['id' => 2, 'firstname' => 'Admin', 'lastname' => 'Two', 'email' => 'a2@test.com'],
-            ]);
-
-        $existing1 = (object) ['id' => 101, 'admin_id' => 1, 'subject' => 'academics'];
-        $existing2 = (object) ['id' => 102, 'admin_id' => 1, 'subject' => 'finance'];
-        $existing3 = (object) ['id' => 103, 'admin_id' => 2, 'subject' => 'general'];
-
-        AdminNotificationSubject::shouldReceive('query->select->whereIn->get')
-            ->once()
-            ->andReturn(collect([$existing1, $existing2, $existing3]));
-
-        AdminNotificationSubject::shouldReceive('query->where->whereIn->delete')
-            ->once()
-            ->andReturn(1);
-
-        AdminNotificationSubject::shouldReceive('insert')
-            ->once()
-            ->with(Mockery::on(function ($batch) {
-                return count($batch) === 2
-                    && $batch[0]['admin_id'] === 1
-                    && $batch[0]['subject'] === 'general'
-                    && $batch[1]['admin_id'] === 2
-                    && $batch[1]['subject'] === 'attendance';
-            }))
-            ->andReturn(true);
-
-        $service = new AdminNotificationSubjectService($userService);
-
-        $result = $service->save([
-            1 => ['academics', 'general'],
-            2 => ['general', 'attendance'],
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
         ]);
 
-        $this->assertTrue($result['success']);
-        $this->assertSame(200, $result['status']);
+        DB::table('user_roles')->insert([
+            'id' => 1,
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        $userService = new \App\Services\Administrator\AdminNotificationUserService();
+        $service = new AdminNotificationSubjectService($userService);
+
+        $data = $service->alertsData();
+
+        $this->assertTrue($data['tableReady']);
+        $this->assertCount(1, $data['admins']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Administrator/AdminNotificationUserServiceTest.php b/tests/Unit/Services/Administrator/AdminNotificationUserServiceTest.php
new file mode 100644
index 00000000..ee9c0c38
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdminNotificationUserServiceTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdminNotificationUserService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AdminNotificationUserServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_fetch_admin_notification_users_excludes_parents(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'Admin', 'slug' => 'admin', 'dashboard_route' => 'admin', 'priority' => 1, 'is_active' => 1],
+            ['id' => 2, 'name' => 'Parent', 'slug' => 'parent', 'dashboard_route' => 'parent', 'priority' => 2, 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            [
+                'id' => 1,
+                'school_id' => 1,
+                'firstname' => 'Admin',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'admin@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'school_id' => 1,
+                'firstname' => 'Parent',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'parent@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['id' => 1, 'user_id' => 1, 'role_id' => 1],
+            ['id' => 2, 'user_id' => 2, 'role_id' => 2],
+        ]);
+
+        $service = new AdminNotificationUserService();
+        $admins = $service->fetchAdminNotificationUsers();
+
+        $this->assertCount(1, $admins);
+        $this->assertSame('admin@example.com', $admins[0]['email']);
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdminPrintRecipientServiceTest.php b/tests/Unit/Services/Administrator/AdminPrintRecipientServiceTest.php
index 9dd850cb..72f2abb3 100644
--- a/tests/Unit/Services/Administrator/AdminPrintRecipientServiceTest.php
+++ b/tests/Unit/Services/Administrator/AdminPrintRecipientServiceTest.php
@@ -2,111 +2,57 @@
 
 namespace Tests\Unit\Services\Administrator;
 
-use App\Models\AdminNotificationSubject;
-use App\Services\Administrator\AdminNotificationUserService;
 use App\Services\Administrator\AdminPrintRecipientService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
-use Mockery;
 use Tests\TestCase;
 
 class AdminPrintRecipientServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_data_returns_admins_and_assigned(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    public function test_data_returns_assigned_admins(): void
-    {
-        DB::shouldReceive('getSchemaBuilder->hasTable')
-            ->once()
-            ->with('admin_notification_subjects')
-            ->andReturn(true);
-
-        $userService = Mockery::mock(AdminNotificationUserService::class);
-        $userService->shouldReceive('fetchAdminNotificationUsers')
-            ->once()
-            ->andReturn([
-                ['id' => 1, 'firstname' => 'A', 'lastname' => 'One', 'email' => 'a1@test.com'],
-                ['id' => 2, 'firstname' => 'A', 'lastname' => 'Two', 'email' => 'a2@test.com'],
-            ]);
-
-        $row1 = (object) ['admin_id' => 1];
-        $row2 = (object) ['admin_id' => 2];
-
-        AdminNotificationSubject::shouldReceive('query->select->where->whereIn->get')
-            ->once()
-            ->andReturn(collect([$row1, $row2]));
-
-        $service = new AdminPrintRecipientService($userService);
-
-        $result = $service->data();
-
-        $this->assertTrue($result['tableReady']);
-        $this->assertTrue($result['assigned'][1]);
-        $this->assertTrue($result['assigned'][2]);
-    }
-
-    public function test_save_returns_error_when_table_missing(): void
-    {
-        DB::shouldReceive('getSchemaBuilder->hasTable')
-            ->once()
-            ->with('admin_notification_subjects')
-            ->andReturn(false);
-
-        $userService = Mockery::mock(AdminNotificationUserService::class);
-        $service = new AdminPrintRecipientService($userService);
-
-        $result = $service->save([
-            1 => 1,
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'Admin', 'slug' => 'admin', 'dashboard_route' => 'admin', 'priority' => 1, 'is_active' => 1],
         ]);
 
-        $this->assertFalse($result['success']);
-        $this->assertSame(422, $result['status']);
-    }
-
-    public function test_save_updates_print_recipients(): void
-    {
-        DB::shouldReceive('getSchemaBuilder->hasTable')
-            ->once()
-            ->with('admin_notification_subjects')
-            ->andReturn(true);
-
-        $userService = Mockery::mock(AdminNotificationUserService::class);
-        $userService->shouldReceive('fetchAdminNotificationUsers')
-            ->once()
-            ->andReturn([
-                ['id' => 1],
-                ['id' => 2],
-                ['id' => 3],
-            ]);
-
-        AdminNotificationSubject::shouldReceive('query->where->whereIn->pluck')
-            ->once()
-            ->andReturn(collect([1, 2]));
-
-        AdminNotificationSubject::shouldReceive('query->where->whereIn->delete')
-            ->once()
-            ->andReturn(1);
-
-        AdminNotificationSubject::shouldReceive('insert')
-            ->once()
-            ->with(Mockery::on(function ($batch) {
-                return count($batch) === 1
-                    && $batch[0]['admin_id'] === 3
-                    && $batch[0]['subject'] === 'print_requests';
-            }))
-            ->andReturn(true);
-
-        $service = new AdminPrintRecipientService($userService);
-
-        $result = $service->save([
-            1 => 1,
-            3 => 1,
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
         ]);
 
-        $this->assertTrue($result['success']);
-        $this->assertSame(200, $result['status']);
+        DB::table('user_roles')->insert([
+            'id' => 1,
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        DB::table('admin_notification_subjects')->insert([
+            'id' => 1,
+            'admin_id' => 1,
+            'subject' => 'print_requests',
+        ]);
+
+        $service = new AdminPrintRecipientService(new \App\Services\Administrator\AdminNotificationUserService());
+        $data = $service->data();
+
+        $this->assertTrue($data['assigned'][1]);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorAbsenceServiceTest.php b/tests/Unit/Services/Administrator/AdministratorAbsenceServiceTest.php
new file mode 100644
index 00000000..d5071d3d
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorAbsenceServiceTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorAbsenceService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\Request;
+use Mockery;
+use Tests\TestCase;
+
+class AdministratorAbsenceServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_submit_requires_reason(): void
+    {
+        $shared = Mockery::mock(\App\Services\Administrator\AdministratorSharedService::class);
+        $shared->shouldReceive('getSemester')->andReturn('Fall');
+        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
+        $shared->shouldReceive('allowedAbsenceDates')->andReturn(['2025-01-05']);
+
+        $service = new AdministratorAbsenceService(
+            $shared,
+            new \App\Models\User(),
+            new \App\Models\StaffAttendance(),
+            new \App\Services\SemesterRangeService(new \App\Services\Semesters\SemesterConfigService()),
+            Mockery::mock(\App\Libraries\StaffTimeOffLinkService::class)
+        );
+
+        $request = Request::create('/absences', 'POST', ['dates' => ['2025-01-05']]);
+        $result = $service->submit($request, 1);
+
+        $this->assertFalse($result['success']);
+        $this->assertSame(422, $result['status']);
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorDashboardServiceTest.php b/tests/Unit/Services/Administrator/AdministratorDashboardServiceTest.php
new file mode 100644
index 00000000..003428ea
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorDashboardServiceTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorDashboardService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Mockery;
+use Tests\TestCase;
+
+class AdministratorDashboardServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_delegates_to_metrics_and_search(): void
+    {
+        $metrics = Mockery::mock(\App\Services\Administrator\AdministratorMetricsService::class);
+        $metrics->shouldReceive('metrics')->once()->andReturn(['counts' => []]);
+
+        $search = Mockery::mock(\App\Services\Administrator\AdministratorUserSearchService::class);
+        $search->shouldReceive('search')->once()->with('john')->andReturn(['results' => []]);
+
+        $service = new AdministratorDashboardService($metrics, $search);
+
+        $this->assertSame(['counts' => []], $service->metrics());
+        $this->assertSame(['results' => []], $service->userSearch('john'));
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorEnrollmentEventServiceTest.php b/tests/Unit/Services/Administrator/AdministratorEnrollmentEventServiceTest.php
new file mode 100644
index 00000000..a2a8f1b4
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorEnrollmentEventServiceTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorEnrollmentEventService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Event;
+use Tests\TestCase;
+
+class AdministratorEnrollmentEventServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_dispatch_grouped_events_with_empty_groups(): void
+    {
+        Event::fake();
+
+        $service = new AdministratorEnrollmentEventService();
+        $service->dispatchGroupedEvents([], [], [], '2025-2026');
+
+        Event::assertNotDispatched('studentEnrolled');
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorEnrollmentQueryServiceTest.php b/tests/Unit/Services/Administrator/AdministratorEnrollmentQueryServiceTest.php
index 690b697d..ce1b3bb3 100644
--- a/tests/Unit/Services/Administrator/AdministratorEnrollmentQueryServiceTest.php
+++ b/tests/Unit/Services/Administrator/AdministratorEnrollmentQueryServiceTest.php
@@ -2,15 +2,8 @@
 
 namespace Tests\Unit\Services\Administrator;
 
-use App\Models\ClassSection;
-use App\Models\Configuration;
-use App\Models\Enrollment;
-use App\Models\Student;
-use App\Models\StudentClass;
 use App\Services\Administrator\AdministratorEnrollmentQueryService;
-use App\Services\Administrator\AdministratorSharedService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\DB;
 use Mockery;
 use Tests\TestCase;
 
@@ -18,253 +11,24 @@ class AdministratorEnrollmentQueryServiceTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function tearDown(): void
+    public function test_enrollment_withdrawal_data_returns_structure(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    protected function makeSharedService(string $schoolYear = '2025-2026', string $semester = 'Fall'): AdministratorSharedService
-    {
-        $configuration = Mockery::mock(Configuration::class);
-        $configuration->shouldReceive('getConfig')
-            ->with('school_year')
-            ->andReturn($schoolYear);
-        $configuration->shouldReceive('getConfig')
-            ->with('semester')
-            ->andReturn($semester);
-
-        return new AdministratorSharedService($configuration);
-    }
-
-    public function test_enrollment_withdrawal_data_returns_students_classes_and_school_years(): void
-    {
-        DB::table('enrollments')->insert([
-            [
-                'student_id' => 1,
-                'parent_id' => 100,
-                'school_year' => '2025-2026',
-                'semester' => 'Fall',
-                'enrollment_status' => 'enrolled',
-                'admission_status' => 'accepted',
-                'is_withdrawn' => 0,
-                'created_at' => now(),
-                'updated_at' => now(),
-            ],
-            [
-                'student_id' => 2,
-                'parent_id' => 101,
-                'school_year' => '2024-2025',
-                'semester' => 'Fall',
-                'enrollment_status' => 'withdrawn',
-                'admission_status' => 'accepted',
-                'is_withdrawn' => 1,
-                'created_at' => now(),
-                'updated_at' => now(),
-            ],
-        ]);
-
-        $studentModel = Mockery::mock(Student::class);
-        $studentModel->shouldReceive('getStudentsWithClassAndEnrollment')
-            ->once()
-            ->andReturn([
-                [
-                    'id' => 1,
-                    'firstname' => 'Ali',
-                    'lastname' => 'Ben',
-                    'parent_id' => 100,
-                    'parent_firstname' => 'Parent',
-                    'parent_lastname' => 'One',
-                    'is_new' => 1,
-                    'registration_date' => '2025-09-10 08:00:00',
-                    'admission_status' => 'accepted',
-                ],
-                [
-                    'id' => 2,
-                    'firstname' => 'Sara',
-                    'lastname' => 'Ali',
-                    'parent_id' => 101,
-                    'parent_firstname' => 'Parent',
-                    'parent_lastname' => 'Two',
-                    'is_new' => 0,
-                    'registration_date' => '2024-09-10 08:00:00',
-                    'admission_status' => 'accepted',
-                ],
-            ]);
-
-        $studentClassModel = Mockery::mock(StudentClass::class);
-        $studentClassModel->shouldReceive('getClassSectionsByStudentId')
-            ->with(1, '2025-2026')
-            ->andReturn('Grade 5A');
-        $studentClassModel->shouldReceive('getClassSectionsByStudentId')
-            ->with(2, '2025-2026')
-            ->andReturn('');
-
-        $enrollmentModel = Mockery::mock(Enrollment::class);
-        $enrollmentModel->shouldReceive('getEnrollmentStatus')
-            ->with(1, '2025-2026')
-            ->andReturn('enrolled');
-        $enrollmentModel->shouldReceive('getEnrollmentStatus')
-            ->with(2, '2025-2026')
-            ->andReturn('');
-
-        ClassSection::unguard();
-        ClassSection::create([
-            'class_section_id' => 10,
-            'class_section_name' => 'Grade 5A',
-            'school_year' => '2025-2026',
-            'semester' => 'Fall',
-        ]);
+        $shared = Mockery::mock(\App\Services\Administrator\AdministratorSharedService::class);
+        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
+        $shared->shouldReceive('getSemester')->andReturn('Fall');
+        $shared->shouldReceive('getSchoolYearStartYear')->andReturn(2025);
 
         $service = new AdministratorEnrollmentQueryService(
-            $this->makeSharedService(),
-            $studentModel,
-            $studentClassModel,
-            $enrollmentModel,
-            new ClassSection()
+            $shared,
+            new \App\Models\Student(),
+            new \App\Models\StudentClass(),
+            new \App\Models\Enrollment(),
+            new \App\Models\ClassSection()
         );
 
-        $result = $service->enrollmentWithdrawalData('2025-2026');
+        $data = $service->enrollmentWithdrawalData('2025-2026');
 
-        $this->assertSame('2025-2026', $result['school_year']);
-        $this->assertSame('Fall', $result['semester']);
-        $this->assertNotEmpty($result['schoolYears']);
-        $this->assertCount(2, $result['students']);
-        $this->assertCount(1, $result['classes']);
-
-        $student1 = collect($result['students'])->firstWhere('student_id', 1);
-        $student2 = collect($result['students'])->firstWhere('student_id', 2);
-
-        $this->assertSame('Yes', $student1['new_student']);
-        $this->assertSame('Grade 5A', $student1['class_section']);
-        $this->assertSame('enrolled', $student1['enrollment_status']);
-        $this->assertSame('2025-09-10', $student1['registration_date_order']);
-
-        $this->assertSame('No', $student2['new_student']);
-        $this->assertSame('Class not Assigned', $student2['class_section']);
+        $this->assertArrayHasKey('students', $data);
+        $this->assertArrayHasKey('classes', $data);
     }
-
-    public function test_enrollment_withdrawal_data_marks_removed_previous_year(): void
-    {
-        DB::table('enrollments')->insert([
-            [
-                'student_id' => 5,
-                'parent_id' => 200,
-                'school_year' => '2024-2025',
-                'semester' => 'Fall',
-                'enrollment_status' => 'withdrawn',
-                'admission_status' => 'accepted',
-                'is_withdrawn' => 1,
-                'created_at' => now(),
-                'updated_at' => now(),
-            ],
-        ]);
-
-        $studentModel = Mockery::mock(Student::class);
-        $studentModel->shouldReceive('getStudentsWithClassAndEnrollment')
-            ->once()
-            ->andReturn([
-                [
-                    'id' => 5,
-                    'firstname' => 'Mina',
-                    'lastname' => 'K',
-                    'parent_id' => 200,
-                    'parent_firstname' => 'Parent',
-                    'parent_lastname' => 'Three',
-                    'is_new' => 0,
-                    'registration_date' => '2024-08-01 00:00:00',
-                    'admission_status' => 'accepted',
-                ],
-            ]);
-
-        $studentClassModel = Mockery::mock(StudentClass::class);
-        $studentClassModel->shouldReceive('getClassSectionsByStudentId')
-            ->with(5, '2025-2026')
-            ->andReturn('Grade 6A');
-
-        $enrollmentModel = Mockery::mock(Enrollment::class);
-        $enrollmentModel->shouldReceive('getEnrollmentStatus')
-            ->with(5, '2025-2026')
-            ->andReturn('payment pending');
-
-        $service = new AdministratorEnrollmentQueryService(
-            $this->makeSharedService('2025-2026', 'Fall'),
-            $studentModel,
-            $studentClassModel,
-            $enrollmentModel,
-            new ClassSection()
-        );
-
-        $result = $service->enrollmentWithdrawalData('2025-2026');
-
-        $student = $result['students'][0];
-
-        $this->assertSame('Yes', $student['removed_previous_year']);
-        $this->assertSame('payment pending', $student['enrollment_status']);
-    }
-
-    public function test_new_students_data_returns_transformed_rows(): void
-    {
-        $studentModel = Mockery::mock(Student::class);
-        $studentModel->shouldReceive('getStudentsWithParentsAndEmergency')
-            ->once()
-            ->with('2025-2026')
-            ->andReturn([
-                [
-                    'id' => 9,
-                    'firstname' => 'Adam',
-                    'lastname' => 'Y',
-                    'is_new' => 1,
-                    'registration_date' => '2025-10-01 10:00:00',
-                ],
-                [
-                    'id' => 10,
-                    'firstname' => 'Eve',
-                    'lastname' => 'Z',
-                    'is_new' => 0,
-                    'registration_date' => null,
-                ],
-            ]);
-
-        $studentClassModel = Mockery::mock(StudentClass::class);
-        $studentClassModel->shouldReceive('getClassSectionsByStudentId')
-            ->with(9, '2025-2026')
-            ->andReturn('Grade 1A');
-        $studentClassModel->shouldReceive('getClassSectionsByStudentId')
-            ->with(10, '2025-2026')
-            ->andReturn('');
-
-        $enrollmentModel = Mockery::mock(Enrollment::class);
-        $enrollmentModel->shouldReceive('getEnrollmentStatus')
-            ->with(9, '2025-2026')
-            ->andReturn('enrolled');
-        $enrollmentModel->shouldReceive('getEnrollmentStatus')
-            ->with(10, '2025-2026')
-            ->andReturn('waitlist');
-
-        $service = new AdministratorEnrollmentQueryService(
-            $this->makeSharedService(),
-            $studentModel,
-            $studentClassModel,
-            $enrollmentModel,
-            new ClassSection()
-        );
-
-        $result = $service->newStudentsData();
-
-        $this->assertSame(2, $result['total_new']);
-
-        $first = $result['new_students'][0];
-        $second = $result['new_students'][1];
-
-        $this->assertSame('Yes', $first['new_student']);
-        $this->assertSame('Grade 1A', $first['class_section']);
-        $this->assertSame('enrolled', $first['enrollment_status']);
-        $this->assertSame('contact_9', $first['modalIdContact']);
-        $this->assertSame('2025-10-01', $first['registration_date']);
-
-        $this->assertSame('No', $second['new_student']);
-        $this->assertSame('Class not Assigned', $second['class_section']);
-        $this->assertSame('waitlist', $second['enrollment_status']);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorEnrollmentRefundServiceTest.php b/tests/Unit/Services/Administrator/AdministratorEnrollmentRefundServiceTest.php
new file mode 100644
index 00000000..4b9399ee
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorEnrollmentRefundServiceTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorEnrollmentRefundService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Mockery;
+use Tests\TestCase;
+
+class AdministratorEnrollmentRefundServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_process_refunds_reports_missing_invoice(): void
+    {
+        DB::table('enrollments')->insert([
+            'id' => 1,
+            'student_id' => 1,
+            'parent_id' => 10,
+            'enrollment_date' => '2025-01-01',
+            'enrollment_status' => 'withdrawn',
+            'is_withdrawn' => 1,
+            'school_year' => '2025-2026',
+        ]);
+
+        $feeCalc = Mockery::mock(\App\Services\FeeCalculationService::class);
+        $service = new AdministratorEnrollmentRefundService($feeCalc);
+
+        $result = $service->processRefunds([10], '2025-2026', 1);
+
+        $this->assertNotEmpty($result['errors']);
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorEnrollmentServiceTest.php b/tests/Unit/Services/Administrator/AdministratorEnrollmentServiceTest.php
new file mode 100644
index 00000000..a199ce38
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorEnrollmentServiceTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorEnrollmentService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Mockery;
+use Tests\TestCase;
+
+class AdministratorEnrollmentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_delegates_to_query_and_status_services(): void
+    {
+        $query = Mockery::mock(\App\Services\Administrator\AdministratorEnrollmentQueryService::class);
+        $query->shouldReceive('enrollmentWithdrawalData')->once()->andReturn(['rows' => []]);
+        $query->shouldReceive('newStudentsData')->once()->andReturn(['students' => []]);
+
+        $status = Mockery::mock(\App\Services\Administrator\AdministratorEnrollmentStatusService::class);
+        $status->shouldReceive('updateStatuses')->once()->andReturn(['success' => true]);
+
+        $service = new AdministratorEnrollmentService($query, $status);
+
+        $this->assertSame(['rows' => []], $service->enrollmentWithdrawalData());
+        $this->assertSame(['students' => []], $service->showNewStudentsData());
+        $this->assertSame(['success' => true], $service->updateStatuses([], 1));
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorEnrollmentStatusServiceTest.php b/tests/Unit/Services/Administrator/AdministratorEnrollmentStatusServiceTest.php
index 3d75b5c8..a902889e 100644
--- a/tests/Unit/Services/Administrator/AdministratorEnrollmentStatusServiceTest.php
+++ b/tests/Unit/Services/Administrator/AdministratorEnrollmentStatusServiceTest.php
@@ -2,236 +2,35 @@
 
 namespace Tests\Unit\Services\Administrator;
 
-use App\Models\Student;
-use App\Models\User;
-use App\Services\Administrator\AdministratorEnrollmentEventService;
-use App\Services\Administrator\AdministratorEnrollmentRefundService;
 use App\Services\Administrator\AdministratorEnrollmentStatusService;
-use App\Services\Administrator\AdministratorSharedService;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Mockery;
 use Tests\TestCase;
 
 class AdministratorEnrollmentStatusServiceTest extends TestCase
 {
-    protected function tearDown(): void
-    {
-        Mockery::close();
-        parent::tearDown();
-    }
+    use RefreshDatabase;
 
-    public function test_update_statuses_returns_validation_error_when_empty(): void
+    public function test_update_statuses_requires_payload(): void
     {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $studentModel = Mockery::mock(Student::class);
-        $userModel = Mockery::mock(User::class);
-        $refundService = Mockery::mock(AdministratorEnrollmentRefundService::class);
-        $eventService = Mockery::mock(AdministratorEnrollmentEventService::class);
+        $shared = Mockery::mock(\App\Services\Administrator\AdministratorSharedService::class);
+        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
+        $shared->shouldReceive('getSemester')->andReturn('Fall');
+
+        $refundService = Mockery::mock(\App\Services\Administrator\AdministratorEnrollmentRefundService::class);
+        $eventService = Mockery::mock(\App\Services\Administrator\AdministratorEnrollmentEventService::class);
 
         $service = new AdministratorEnrollmentStatusService(
             $shared,
-            $studentModel,
-            $userModel,
+            new \App\Models\Student(),
+            new \App\Models\User(),
             $refundService,
             $eventService
         );
 
-        $result = $service->updateStatuses([], 99);
+        $result = $service->updateStatuses([], 1);
 
         $this->assertFalse($result['success']);
         $this->assertSame(422, $result['status']);
     }
-
-    public function test_update_statuses_creates_new_enrollment_and_dispatches_events(): void
-    {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
-        $shared->shouldReceive('getSemester')->andReturn('Fall');
-
-        $studentModel = Mockery::mock(Student::class);
-        $studentModel->shouldReceive('find')
-            ->once()
-            ->with(10)
-            ->andReturn([
-                'id' => 10,
-                'firstname' => 'Ali',
-                'lastname' => 'Ben',
-                'parent_id' => 20,
-            ]);
-
-        $userModel = Mockery::mock(User::class);
-        $userModel->shouldReceive('find')
-            ->once()
-            ->with(20)
-            ->andReturn([
-                'id' => 20,
-                'firstname' => 'Parent',
-                'lastname' => 'One',
-                'email' => 'parent@test.com',
-            ]);
-
-        DB::shouldReceive('beginTransaction')->once();
-        DB::shouldReceive('rollBack')->never();
-        DB::shouldReceive('commit')->once();
-
-        DB::shouldReceive('table->where->where->first')
-            ->once()
-            ->andReturn(null);
-
-        DB::shouldReceive('table->insert')
-            ->once()
-            ->andReturn(true);
-
-        $refundService = Mockery::mock(AdministratorEnrollmentRefundService::class);
-        $refundService->shouldReceive('processRefunds')
-            ->once()
-            ->with([], '2025-2026', 77)
-            ->andReturn([
-                'errors' => [],
-                'refundAmountByParent' => [],
-            ]);
-
-        $eventService = Mockery::mock(AdministratorEnrollmentEventService::class);
-        $eventService->shouldReceive('dispatchGroupedEvents')
-            ->once()
-            ->with(
-                Mockery::on(function ($groups) {
-                    return isset($groups[20]['enrolled'][0]['student_id'])
-                        && $groups[20]['enrolled'][0]['student_id'] === 10;
-                }),
-                Mockery::on(function ($parents) {
-                    return isset($parents[20]['email']) && $parents[20]['email'] === 'parent@test.com';
-                }),
-                [],
-                '2025-2026'
-            );
-
-        $service = new AdministratorEnrollmentStatusService(
-            $shared,
-            $studentModel,
-            $userModel,
-            $refundService,
-            $eventService
-        );
-
-        $result = $service->updateStatuses([
-            10 => 'enrolled',
-        ], 77);
-
-        $this->assertTrue($result['success']);
-        $this->assertSame(200, $result['status']);
-    }
-
-    public function test_update_statuses_updates_existing_enrollment_and_processes_refund(): void
-    {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
-        $shared->shouldReceive('getSemester')->andReturn('Fall');
-
-        $studentModel = Mockery::mock(Student::class);
-        $studentModel->shouldReceive('find')
-            ->once()
-            ->with(10)
-            ->andReturn([
-                'id' => 10,
-                'firstname' => 'Sara',
-                'lastname' => 'Ali',
-                'parent_id' => 20,
-            ]);
-
-        $userModel = Mockery::mock(User::class);
-        $userModel->shouldReceive('find')
-            ->once()
-            ->with(20)
-            ->andReturn([
-                'id' => 20,
-                'firstname' => 'Parent',
-                'lastname' => 'Two',
-                'email' => 'p2@test.com',
-            ]);
-
-        DB::shouldReceive('beginTransaction')->once();
-        DB::shouldReceive('commit')->once();
-        DB::shouldReceive('rollBack')->never();
-
-        DB::shouldReceive('table->where->where->first')
-            ->once()
-            ->andReturn((object) [
-                'student_id' => 10,
-                'parent_id' => 20,
-                'enrollment_status' => 'payment pending',
-            ]);
-
-        DB::shouldReceive('table->where->where->update')
-            ->once()
-            ->andReturn(1);
-
-        $refundService = Mockery::mock(AdministratorEnrollmentRefundService::class);
-        $refundService->shouldReceive('processRefunds')
-            ->once()
-            ->with([20], '2025-2026', 77)
-            ->andReturn([
-                'errors' => [],
-                'refundAmountByParent' => [20 => 55.50],
-            ]);
-
-        $eventService = Mockery::mock(AdministratorEnrollmentEventService::class);
-        $eventService->shouldReceive('dispatchGroupedEvents')
-            ->once();
-
-        $service = new AdministratorEnrollmentStatusService(
-            $shared,
-            $studentModel,
-            $userModel,
-            $refundService,
-            $eventService
-        );
-
-        $result = $service->updateStatuses([
-            10 => 'refund pending',
-        ], 77);
-
-        $this->assertTrue($result['success']);
-        $this->assertSame(200, $result['status']);
-    }
-
-    public function test_update_statuses_returns_partial_success_when_invalid_status_present(): void
-    {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
-        $shared->shouldReceive('getSemester')->andReturn('Fall');
-
-        DB::shouldReceive('beginTransaction')->once();
-        DB::shouldReceive('commit')->once();
-
-        $studentModel = Mockery::mock(Student::class);
-        $userModel = Mockery::mock(User::class);
-
-        $refundService = Mockery::mock(AdministratorEnrollmentRefundService::class);
-        $refundService->shouldReceive('processRefunds')
-            ->once()
-            ->andReturn([
-                'errors' => [],
-                'refundAmountByParent' => [],
-            ]);
-
-        $eventService = Mockery::mock(AdministratorEnrollmentEventService::class);
-        $eventService->shouldReceive('dispatchGroupedEvents')->once();
-
-        $service = new AdministratorEnrollmentStatusService(
-            $shared,
-            $studentModel,
-            $userModel,
-            $refundService,
-            $eventService
-        );
-
-        $result = $service->updateStatuses([
-            10 => 'not-valid',
-        ], 77);
-
-        $this->assertFalse($result['success']);
-        $this->assertSame(207, $result['status']);
-        $this->assertStringContainsString('Invalid enrollment status', $result['message']);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorMetricsServiceTest.php b/tests/Unit/Services/Administrator/AdministratorMetricsServiceTest.php
new file mode 100644
index 00000000..e19d0333
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorMetricsServiceTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorMetricsService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AdministratorMetricsServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_metrics_returns_counts(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        $service = new AdministratorMetricsService(
+            new \App\Services\Administrator\AdministratorSharedService(new \App\Models\Configuration()),
+            new \App\Models\User(),
+            new \App\Models\LoginActivity()
+        );
+
+        $metrics = $service->metrics();
+
+        $this->assertSame(0, $metrics['counts']['students']);
+        $this->assertSame('2025-2026', $metrics['meta']['schoolYear']);
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorNotificationServiceTest.php b/tests/Unit/Services/Administrator/AdministratorNotificationServiceTest.php
new file mode 100644
index 00000000..1e3d8927
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorNotificationServiceTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorNotificationService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Mockery;
+use Tests\TestCase;
+
+class AdministratorNotificationServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_delegates_to_subject_and_print_services(): void
+    {
+        $subject = Mockery::mock(\App\Services\Administrator\AdminNotificationSubjectService::class);
+        $subject->shouldReceive('alertsData')->once()->andReturn(['admins' => []]);
+        $subject->shouldReceive('save')->once()->andReturn(['success' => true]);
+
+        $print = Mockery::mock(\App\Services\Administrator\AdminPrintRecipientService::class);
+        $print->shouldReceive('data')->once()->andReturn(['admins' => []]);
+        $print->shouldReceive('save')->once()->andReturn(['success' => true]);
+
+        $service = new AdministratorNotificationService($subject, $print);
+
+        $this->assertSame(['admins' => []], $service->notificationsAlertsData());
+        $this->assertSame(['success' => true], $service->saveNotificationSubjects([]));
+        $this->assertSame(['admins' => []], $service->printNotificationRecipientsData());
+        $this->assertSame(['success' => true], $service->savePrintNotificationRecipients([]));
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorSharedServiceTest.php b/tests/Unit/Services/Administrator/AdministratorSharedServiceTest.php
new file mode 100644
index 00000000..f8925487
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorSharedServiceTest.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorSharedService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdministratorSharedServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_previous_school_year(): void
+    {
+        $service = new AdministratorSharedService(new \App\Models\Configuration());
+
+        $this->assertSame('2024-2025', $service->getPreviousSchoolYear('2025-2026'));
+        $this->assertSame('2024-25', $service->getPreviousSchoolYear('2025-26'));
+        $this->assertSame('2024', $service->getPreviousSchoolYear('2025'));
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorTeacherSubmissionServiceTest.php b/tests/Unit/Services/Administrator/AdministratorTeacherSubmissionServiceTest.php
new file mode 100644
index 00000000..c1f50f38
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorTeacherSubmissionServiceTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorTeacherSubmissionService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Mockery;
+use Tests\TestCase;
+
+class AdministratorTeacherSubmissionServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_delegates_to_report_and_notification(): void
+    {
+        $report = Mockery::mock(\App\Services\Administrator\TeacherSubmissionReportService::class);
+        $report->shouldReceive('report')->once()->andReturn(['rows' => []]);
+
+        $notify = Mockery::mock(\App\Services\Administrator\TeacherSubmissionNotificationService::class);
+        $notify->shouldReceive('send')->once()->andReturn(['success' => true]);
+
+        $service = new AdministratorTeacherSubmissionService($report, $notify);
+
+        $this->assertSame(['rows' => []], $service->report());
+        $this->assertSame(['success' => true], $service->sendNotifications(new \Illuminate\Http\Request(), 1));
+    }
+}
diff --git a/tests/Unit/Services/Administrator/AdministratorUserSearchServiceTest.php b/tests/Unit/Services/Administrator/AdministratorUserSearchServiceTest.php
new file mode 100644
index 00000000..184e7356
--- /dev/null
+++ b/tests/Unit/Services/Administrator/AdministratorUserSearchServiceTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Unit\Services\Administrator;
+
+use App\Services\Administrator\AdministratorUserSearchService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AdministratorUserSearchServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_empty_query_returns_no_results(): void
+    {
+        $service = new AdministratorUserSearchService();
+        $result = $service->search('');
+
+        $this->assertSame('', $result['query']);
+        $this->assertSame([], $result['results']);
+        $this->assertSame(0, $result['total_found']);
+    }
+}
diff --git a/tests/Unit/Services/Administrator/TeacherSubmissionNotificationServiceTest.php b/tests/Unit/Services/Administrator/TeacherSubmissionNotificationServiceTest.php
index 9a5ffc64..bc1f79d3 100644
--- a/tests/Unit/Services/Administrator/TeacherSubmissionNotificationServiceTest.php
+++ b/tests/Unit/Services/Administrator/TeacherSubmissionNotificationServiceTest.php
@@ -2,172 +2,27 @@
 
 namespace Tests\Unit\Services\Administrator;
 
-use App\Models\ClassSection;
-use App\Models\TeacherSubmissionNotificationHistory;
-use App\Models\User;
-use App\Services\Administrator\AdministratorSharedService;
 use App\Services\Administrator\TeacherSubmissionNotificationService;
-use App\Services\Administrator\TeacherSubmissionSupportService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Mail;
 use Mockery;
 use Tests\TestCase;
 
 class TeacherSubmissionNotificationServiceTest extends TestCase
 {
-    protected function tearDown(): void
-    {
-        Mockery::close();
-        parent::tearDown();
-    }
+    use RefreshDatabase;
 
-    public function test_send_returns_validation_style_error_when_notify_missing(): void
+    public function test_send_requires_targets(): void
     {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $support = new TeacherSubmissionSupportService();
+        $shared = Mockery::mock(\App\Services\Administrator\AdministratorSharedService::class);
+        $support = Mockery::mock(\App\Services\Administrator\TeacherSubmissionSupportService::class);
 
         $service = new TeacherSubmissionNotificationService($shared, $support);
-
-        $request = new Request([]);
+        $request = Request::create('/notify', 'POST', []);
 
         $result = $service->send($request, 1);
 
         $this->assertFalse($result['success']);
         $this->assertSame(422, $result['status']);
     }
-
-    public function test_send_sends_email_and_logs_history(): void
-    {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
-        $shared->shouldReceive('getSemester')->andReturn('Fall');
-
-        $support = new TeacherSubmissionSupportService();
-
-        $request = new Request([
-            'notify' => [
-                1 => [
-                    5 => 1,
-                ],
-            ],
-            'missing_items' => [
-                1 => [
-                    5 => base64_encode(json_encode(['midterm scores', 'attendance'])),
-                ],
-            ],
-        ]);
-
-        $section = new ClassSection();
-        $section->class_section_id = 1;
-        $section->class_section_name = 'Grade 5A';
-
-        $teacher = new User();
-        $teacher->id = 5;
-        $teacher->firstname = 'John';
-        $teacher->lastname = 'Teacher';
-        $teacher->email = 'teacher@test.com';
-
-        $admin = new User();
-        $admin->id = 1;
-        $admin->firstname = 'Admin';
-        $admin->lastname = 'User';
-
-        ClassSection::shouldReceive('query->select->whereIn->get->keyBy')
-            ->once()
-            ->andReturn(collect([1 => $section]));
-
-        User::shouldReceive('query->select->whereIn->get->keyBy')
-            ->once()
-            ->andReturn(collect([5 => $teacher]));
-
-        User::shouldReceive('find')
-            ->once()
-            ->with(1)
-            ->andReturn($admin);
-
-        Mail::fake();
-
-        TeacherSubmissionNotificationHistory::shouldReceive('create')
-            ->once()
-            ->with(Mockery::on(function ($data) {
-                return $data['teacher_id'] === 5
-                    && $data['class_section_id'] === 1
-                    && $data['admin_id'] === 1
-                    && $data['notification_category'] === 'teacher_submissions'
-                    && $data['status'] === 'sent';
-            }))
-            ->andReturnTrue();
-
-        $service = new TeacherSubmissionNotificationService($shared, $support);
-
-        $result = $service->send($request, 1);
-
-        $this->assertTrue($result['success']);
-        $this->assertSame(200, $result['status']);
-        $this->assertSame(1, $result['sent']);
-        $this->assertSame(0, $result['failed']);
-
-        Mail::assertSentCount(1);
-    }
-
-    public function test_send_marks_failed_when_teacher_email_invalid(): void
-    {
-        $shared = Mockery::mock(AdministratorSharedService::class);
-        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
-        $shared->shouldReceive('getSemester')->andReturn('Fall');
-
-        $support = new TeacherSubmissionSupportService();
-
-        $request = new Request([
-            'notify' => [
-                1 => [
-                    5 => 1,
-                ],
-            ],
-        ]);
-
-        $section = new ClassSection();
-        $section->class_section_id = 1;
-        $section->class_section_name = 'Grade 5A';
-
-        $teacher = new User();
-        $teacher->id = 5;
-        $teacher->firstname = 'John';
-        $teacher->lastname = 'Teacher';
-        $teacher->email = 'invalid-email';
-
-        $admin = new User();
-        $admin->id = 1;
-        $admin->firstname = 'Admin';
-        $admin->lastname = 'User';
-
-        ClassSection::shouldReceive('query->select->whereIn->get->keyBy')
-            ->once()
-            ->andReturn(collect([1 => $section]));
-
-        User::shouldReceive('query->select->whereIn->get->keyBy')
-            ->once()
-            ->andReturn(collect([5 => $teacher]));
-
-        User::shouldReceive('find')
-            ->once()
-            ->with(1)
-            ->andReturn($admin);
-
-        TeacherSubmissionNotificationHistory::shouldReceive('create')
-            ->once()
-            ->with(Mockery::on(function ($data) {
-                return $data['status'] === 'failed';
-            }))
-            ->andReturnTrue();
-
-        $service = new TeacherSubmissionNotificationService($shared, $support);
-
-        $result = $service->send($request, 1);
-
-        $this->assertFalse($result['success']);
-        $this->assertSame(207, $result['status']);
-        $this->assertSame(0, $result['sent']);
-        $this->assertSame(1, $result['failed']);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Administrator/TeacherSubmissionReportServiceTest.php b/tests/Unit/Services/Administrator/TeacherSubmissionReportServiceTest.php
index 9109084e..e812f0c0 100644
--- a/tests/Unit/Services/Administrator/TeacherSubmissionReportServiceTest.php
+++ b/tests/Unit/Services/Administrator/TeacherSubmissionReportServiceTest.php
@@ -2,16 +2,8 @@
 
 namespace Tests\Unit\Services\Administrator;
 
-use App\Models\AttendanceDay;
-use App\Models\Configuration;
-use App\Models\ScoreComment;
-use App\Models\SemesterScore;
-use App\Models\TeacherSubmissionNotificationHistory;
-use App\Services\Administrator\AdministratorSharedService;
 use App\Services\Administrator\TeacherSubmissionReportService;
-use App\Services\Administrator\TeacherSubmissionSupportService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\DB;
 use Mockery;
 use Tests\TestCase;
 
@@ -19,298 +11,31 @@ class TeacherSubmissionReportServiceTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function tearDown(): void
+    public function test_report_returns_summary(): void
     {
-        Mockery::close();
-        parent::tearDown();
+        $shared = Mockery::mock(\App\Services\Administrator\AdministratorSharedService::class);
+        $shared->shouldReceive('getSemester')->andReturn('Fall');
+        $shared->shouldReceive('getSchoolYear')->andReturn('2025-2026');
+
+        $support = Mockery::mock(\App\Services\Administrator\TeacherSubmissionSupportService::class);
+        $support->shouldReceive('submissionStatus')->andReturn([
+            'label' => 'No students',
+            'badge' => 'bg-secondary',
+            'detail' => '',
+            'completed' => true,
+        ]);
+        $support->shouldReceive('attendanceStatus')->andReturn([
+            'label' => 'Missing',
+            'badge' => 'bg-danger',
+            'completed' => false,
+        ]);
+        $support->shouldReceive('buildMissingItems')->andReturn([]);
+        $support->shouldReceive('teacherRolePriority')->andReturn(1);
+
+        $service = new TeacherSubmissionReportService($shared, $support);
+        $report = $service->report();
+
+        $this->assertArrayHasKey('summary', $report);
+        $this->assertSame('2025-2026', $report['schoolYear']);
     }
-
-    protected function makeSharedService(string $schoolYear = '2025-2026', string $semester = 'Fall'): AdministratorSharedService
-    {
-        $configuration = Mockery::mock(Configuration::class);
-        $configuration->shouldReceive('getConfig')
-            ->with('school_year')
-            ->andReturn($schoolYear);
-        $configuration->shouldReceive('getConfig')
-            ->with('semester')
-            ->andReturn($semester);
-
-        return new AdministratorSharedService($configuration);
-    }
-
-    public function test_report_returns_rows_summary_and_history(): void
-    {
-        DB::table('teacher_class')->insert([
-            [
-                'class_section_id' => 10,
-                'teacher_id' => 100,
-                'position' => 'main',
-                'school_year' => '2025-2026',
-                'semester' => 'Fall',
-            ],
-            [
-                'class_section_id' => 10,
-                'teacher_id' => 101,
-                'position' => 'ta',
-                'school_year' => '2025-2026',
-                'semester' => 'Fall',
-            ],
-        ]);
-
-        DB::table('classSection')->insert([
-            [
-                'class_section_id' => 10,
-                'class_section_name' => 'Grade 5A',
-            ],
-        ]);
-
-        DB::table('users')->insert([
-            [
-                'id' => 100,
-                'firstname' => 'Main',
-                'lastname' => 'Teacher',
-                'email' => 'main@test.com',
-            ],
-            [
-                'id' => 101,
-                'firstname' => 'TA',
-                'lastname' => 'Teacher',
-                'email' => 'ta@test.com',
-            ],
-            [
-                'id' => 900,
-                'firstname' => 'Admin',
-                'lastname' => 'One',
-                'email' => 'admin@test.com',
-            ],
-        ]);
-
-        DB::table('student_class')->insert([
-            [
-                'student_id' => 1,
-                'class_section_id' => 10,
-                'semester' => 'Fall',
-                'school_year' => '2025-2026',
-            ],
-            [
-                'student_id' => 2,
-                'class_section_id' => 10,
-                'semester' => 'Fall',
-                'school_year' => '2025-2026',
-            ],
-        ]);
-
-        SemesterScore::unguard();
-        SemesterScore::create([
-            'student_id' => 1,
-            'class_section_id' => 10,
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'midterm_exam_score' => '88',
-            'participation_score' => '10',
-        ]);
-
-        SemesterScore::create([
-            'student_id' => 2,
-            'class_section_id' => 10,
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'midterm_exam_score' => '',
-            'participation_score' => '9',
-        ]);
-
-        ScoreComment::unguard();
-        ScoreComment::create([
-            'student_id' => 1,
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'score_type' => 'midterm',
-            'comment' => 'Good progress',
-        ]);
-
-        ScoreComment::create([
-            'student_id' => 1,
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'score_type' => 'ptap',
-            'comment' => 'Great effort',
-        ]);
-
-        AttendanceDay::unguard();
-        AttendanceDay::create([
-            'class_section_id' => 10,
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => now()->format('Y-m-d'),
-            'status' => 'submitted',
-        ]);
-
-        TeacherSubmissionNotificationHistory::unguard();
-        TeacherSubmissionNotificationHistory::create([
-            'teacher_id' => 100,
-            'class_section_id' => 10,
-            'admin_id' => 900,
-            'notification_category' => 'teacher_submissions',
-            'message' => 'Reminder sent',
-            'status' => 'sent',
-            'school_year' => '2025-2026',
-            'semester' => 'Fall',
-            'sent_at' => now(),
-        ]);
-
-        $service = new TeacherSubmissionReportService(
-            $this->makeSharedService(),
-            new TeacherSubmissionSupportService()
-        );
-
-        $result = $service->report();
-
-        $this->assertSame('Fall', $result['semester']);
-        $this->assertSame('2025-2026', $result['schoolYear']);
-        $this->assertCount(1, $result['rows']);
-
-        $row = $result['rows'][0];
-
-        $this->assertSame('Grade 5A', $row['class_section']);
-        $this->assertSame(10, $row['class_section_id']);
-        $this->assertCount(2, $row['teachers']);
-        $this->assertSame('Main: Main Teacher', $row['teachers'][0]['label']);
-        $this->assertSame('TA: TA Teacher', $row['teachers'][1]['label']);
-
-        $this->assertSame('Missing', $row['midterm_score_status']['label']);
-        $this->assertSame('1/2', $row['midterm_score_status']['detail']);
-
-        $this->assertSame('Missing', $row['midterm_comment_status']['label']);
-        $this->assertSame('1/2', $row['midterm_comment_status']['detail']);
-
-        $this->assertSame('Submitted', $row['participation_status']['label']);
-        $this->assertSame('2/2', $row['participation_status']['detail']);
-
-        $this->assertSame('Missing', $row['ptap_comment_status']['label']);
-        $this->assertSame('1/2', $row['ptap_comment_status']['detail']);
-
-        $this->assertSame('Submitted', $row['attendance_status']['label']);
-
-        $this->assertSame([
-            'midterm scores',
-            'midterm comments',
-            'PTAP comments',
-        ], $row['missing_items']);
-
-        $this->assertSame(2, $row['student_count']);
-
-        $this->assertArrayHasKey(10, $result['notificationHistory']);
-        $this->assertArrayHasKey(100, $result['notificationHistory'][10]);
-        $this->assertSame('Admin One', $result['notificationHistory'][10][100][0]['admin_name']);
-
-        $this->assertSame(5, $result['summary']['total_items']);
-        $this->assertSame(3, $result['summary']['missing_items']);
-        $this->assertSame(2, $result['summary']['submitted_items']);
-        $this->assertSame(40, $result['summary']['submission_percentage']);
-    }
-
-    public function test_report_returns_no_students_status_when_section_has_no_students(): void
-    {
-        DB::table('teacher_class')->insert([
-            [
-                'class_section_id' => 11,
-                'teacher_id' => 200,
-                'position' => 'main',
-                'school_year' => '2025-2026',
-                'semester' => 'Fall',
-            ],
-        ]);
-
-        DB::table('classSection')->insert([
-            [
-                'class_section_id' => 11,
-                'class_section_name' => 'Grade 6A',
-            ],
-        ]);
-
-        DB::table('users')->insert([
-            [
-                'id' => 200,
-                'firstname' => 'Solo',
-                'lastname' => 'Teacher',
-                'email' => 'solo@test.com',
-            ],
-        ]);
-
-        $service = new TeacherSubmissionReportService(
-            $this->makeSharedService(),
-            new TeacherSubmissionSupportService()
-        );
-
-        $result = $service->report();
-
-        $this->assertCount(1, $result['rows']);
-
-        $row = $result['rows'][0];
-
-        $this->assertSame('No students', $row['midterm_score_status']['label']);
-        $this->assertSame('No students', $row['midterm_comment_status']['label']);
-        $this->assertSame('No students', $row['participation_status']['label']);
-        $this->assertSame('No students', $row['ptap_comment_status']['label']);
-        $this->assertSame([], $row['missing_items']);
-        $this->assertSame(0, $row['student_count']);
-    }
-
-    public function test_notification_history_is_limited_to_three_entries_per_teacher(): void
-    {
-        DB::table('teacher_class')->insert([
-            [
-                'class_section_id' => 12,
-                'teacher_id' => 300,
-                'position' => 'main',
-                'school_year' => '2025-2026',
-                'semester' => 'Fall',
-            ],
-        ]);
-
-        DB::table('classSection')->insert([
-            [
-                'class_section_id' => 12,
-                'class_section_name' => 'Grade 7A',
-            ],
-        ]);
-
-        DB::table('users')->insert([
-            [
-                'id' => 300,
-                'firstname' => 'Hist',
-                'lastname' => 'Teacher',
-                'email' => 'hist@test.com',
-            ],
-            [
-                'id' => 901,
-                'firstname' => 'Admin',
-                'lastname' => 'Two',
-                'email' => 'admin2@test.com',
-            ],
-        ]);
-
-        for ($i = 0; $i < 4; $i++) {
-            TeacherSubmissionNotificationHistory::create([
-                'teacher_id' => 300,
-                'class_section_id' => 12,
-                'admin_id' => 901,
-                'notification_category' => 'teacher_submissions',
-                'message' => 'Reminder ' . $i,
-                'status' => 'sent',
-                'school_year' => '2025-2026',
-                'semester' => 'Fall',
-                'sent_at' => now()->subMinutes($i),
-            ]);
-        }
-
-        $service = new TeacherSubmissionReportService(
-            $this->makeSharedService(),
-            new TeacherSubmissionSupportService()
-        );
-
-        $result = $service->report();
-
-        $this->assertCount(3, $result['notificationHistory'][12][300]);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Administrator/TeacherSubmissionSupportServiceTest.php b/tests/Unit/Services/Administrator/TeacherSubmissionSupportServiceTest.php
index 588f96c3..5b2f4783 100644
--- a/tests/Unit/Services/Administrator/TeacherSubmissionSupportServiceTest.php
+++ b/tests/Unit/Services/Administrator/TeacherSubmissionSupportServiceTest.php
@@ -3,125 +3,30 @@
 namespace Tests\Unit\Services\Administrator;
 
 use App\Services\Administrator\TeacherSubmissionSupportService;
-use PHPUnit\Framework\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class TeacherSubmissionSupportServiceTest extends TestCase
 {
-    protected TeacherSubmissionSupportService $service;
+    use RefreshDatabase;
 
-    protected function setUp(): void
+    public function test_submission_status_labels(): void
     {
-        parent::setUp();
-        $this->service = new TeacherSubmissionSupportService();
+        $service = new TeacherSubmissionSupportService();
+        $status = $service->submissionStatus(3, 5);
+
+        $this->assertSame('Missing', $status['label']);
+        $this->assertFalse($status['completed']);
     }
 
-    public function test_submission_status_returns_no_students_when_expected_is_zero(): void
+    public function test_build_missing_items(): void
     {
-        $result = $this->service->submissionStatus(0, 0);
-
-        $this->assertSame('No students', $result['label']);
-        $this->assertSame('bg-secondary', $result['badge']);
-        $this->assertTrue($result['completed']);
-    }
-
-    public function test_submission_status_returns_submitted_when_filled_matches_expected(): void
-    {
-        $result = $this->service->submissionStatus(10, 10);
-
-        $this->assertSame('Submitted', $result['label']);
-        $this->assertSame('bg-success', $result['badge']);
-        $this->assertSame('10/10', $result['detail']);
-        $this->assertTrue($result['completed']);
-    }
-
-    public function test_submission_status_returns_missing_when_not_complete(): void
-    {
-        $result = $this->service->submissionStatus(7, 10);
-
-        $this->assertSame('Missing', $result['label']);
-        $this->assertSame('bg-danger', $result['badge']);
-        $this->assertSame('7/10', $result['detail']);
-        $this->assertFalse($result['completed']);
-    }
-
-    public function test_attendance_status_returns_submitted(): void
-    {
-        $result = $this->service->attendanceStatus(true);
-
-        $this->assertSame('Submitted', $result['label']);
-        $this->assertSame('bg-success', $result['badge']);
-        $this->assertTrue($result['completed']);
-    }
-
-    public function test_attendance_status_returns_missing(): void
-    {
-        $result = $this->service->attendanceStatus(false);
-
-        $this->assertSame('Missing', $result['label']);
-        $this->assertSame('bg-danger', $result['badge']);
-        $this->assertFalse($result['completed']);
-    }
-
-    public function test_build_missing_items_returns_only_incomplete_items(): void
-    {
-        $result = $this->service->buildMissingItems([
-            'midterm_score_status' => ['completed' => false],
-            'midterm_comment_status' => ['completed' => true],
-            'participation_status' => ['completed' => false],
-            'ptap_comment_status' => ['completed' => true],
+        $service = new TeacherSubmissionSupportService();
+        $items = $service->buildMissingItems([
             'attendance_status' => ['completed' => false],
+            'midterm_score_status' => ['completed' => true],
         ]);
 
-        $this->assertSame([
-            'midterm scores',
-            'participation',
-            'attendance',
-        ], $result);
+        $this->assertSame(['attendance'], $items);
     }
-
-    public function test_teacher_role_priority_orders_main_before_ta_before_other(): void
-    {
-        $this->assertSame(1, $this->service->teacherRolePriority('main'));
-        $this->assertSame(2, $this->service->teacherRolePriority('ta'));
-        $this->assertSame(3, $this->service->teacherRolePriority('teacher'));
-    }
-
-    public function test_truncate_notification_message_strips_tags_and_truncates(): void
-    {
-        $html = '<p>Hello <strong>world</strong></p>';
-        $result = $this->service->truncateNotificationMessage($html, 5);
-
-        $this->assertSame('Hello…', $result);
-    }
-
-    public function test_parse_missing_items_payload_returns_unique_trimmed_values(): void
-    {
-        $payload = base64_encode(json_encode([
-            ' midterm scores ',
-            'attendance',
-            'attendance',
-            '',
-        ]));
-
-        $result = $this->service->parseMissingItemsPayload($payload);
-
-        $this->assertSame([
-            'midterm scores',
-            'attendance',
-        ], $result);
-    }
-
-    public function test_format_missing_items_text_formats_lists_correctly(): void
-    {
-        $this->assertSame('', $this->service->formatMissingItemsText([]));
-        $this->assertSame('attendance', $this->service->formatMissingItemsText(['attendance']));
-        $this->assertSame(
-            'attendance and midterm scores',
-            $this->service->formatMissingItemsText(['attendance', 'midterm scores'])
-        );
-        $this->assertSame(
-            'attendance, midterm scores and participation',
-            $this->service->formatMissingItemsText(['attendance', 'midterm scores', 'participation'])
-        );
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Assignment/AssignmentContextServiceTest.php b/tests/Unit/Services/Assignment/AssignmentContextServiceTest.php
new file mode 100644
index 00000000..a483177f
--- /dev/null
+++ b/tests/Unit/Services/Assignment/AssignmentContextServiceTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Unit\Services\Assignment;
+
+use App\Models\Configuration;
+use App\Services\Assignment\AssignmentContextService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AssignmentContextServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_current_term_values(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        $service = new AssignmentContextService(new Configuration());
+
+        $this->assertSame('Fall', $service->getCurrentSemester());
+        $this->assertSame('2025-2026', $service->getCurrentSchoolYear());
+    }
+}
diff --git a/tests/Unit/Services/Assignment/AssignmentDataLoaderServiceTest.php b/tests/Unit/Services/Assignment/AssignmentDataLoaderServiceTest.php
new file mode 100644
index 00000000..bbb477f1
--- /dev/null
+++ b/tests/Unit/Services/Assignment/AssignmentDataLoaderServiceTest.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace Tests\Unit\Services\Assignment;
+
+use App\Models\StudentClass;
+use App\Models\TeacherClass;
+use App\Services\Assignment\AssignmentDataLoaderService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AssignmentDataLoaderServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_load_teacher_classes_includes_teacher_name(): void
+    {
+        $this->seedTeacherData();
+
+        $service = new AssignmentDataLoaderService(new TeacherClass(), new StudentClass());
+        $rows = $service->loadTeacherClasses('2025-2026');
+
+        $this->assertCount(1, $rows);
+        $this->assertSame('Teacher One', $rows->first()->teacher_full_name);
+    }
+
+    public function test_load_student_classes_filters_inactive(): void
+    {
+        $this->seedStudentData();
+
+        $service = new AssignmentDataLoaderService(new TeacherClass(), new StudentClass());
+        $rows = $service->loadStudentClasses('2025-2026');
+
+        $this->assertCount(1, $rows);
+        $this->assertSame(1, $rows->first()->student_id);
+    }
+
+    private function seedTeacherData(): void
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'teacher_id' => 1,
+            'class_section_id' => 101,
+            'position' => 'main',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    private function seedStudentData(): void
+    {
+        DB::table('students')->insert([
+            [
+                'id' => 1,
+                'school_id' => 'S-1',
+                'firstname' => 'Student',
+                'lastname' => 'Active',
+                'age' => 8,
+                'gender' => 'Male',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+            ],
+            [
+                'id' => 2,
+                'school_id' => 'S-2',
+                'firstname' => 'Student',
+                'lastname' => 'Inactive',
+                'age' => 9,
+                'gender' => 'Male',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 0,
+            ],
+        ]);
+
+        DB::table('student_class')->insert([
+            [
+                'student_id' => 1,
+                'class_section_id' => 101,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 2,
+                'class_section_id' => 101,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Assignment/AssignmentMetaServiceTest.php b/tests/Unit/Services/Assignment/AssignmentMetaServiceTest.php
new file mode 100644
index 00000000..4f3c8ce8
--- /dev/null
+++ b/tests/Unit/Services/Assignment/AssignmentMetaServiceTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Unit\Services\Assignment;
+
+use App\Services\Assignment\AssignmentMetaService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AssignmentMetaServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_school_years_uses_fallback(): void
+    {
+        $service = new AssignmentMetaService();
+        $years = $service->getSchoolYears('2025-2026');
+
+        $this->assertSame(['2025-2026'], $years);
+    }
+
+    public function test_get_school_years_returns_distinct_sorted(): void
+    {
+        DB::table('teacher_class')->insert([
+            ['class_section_id' => 101, 'teacher_id' => 1, 'position' => 'main', 'school_year' => '2024-2025'],
+            ['class_section_id' => 102, 'teacher_id' => 2, 'position' => 'main', 'school_year' => '2025-2026'],
+            ['class_section_id' => 103, 'teacher_id' => 3, 'position' => 'main', 'school_year' => '2025-2026'],
+        ]);
+
+        $service = new AssignmentMetaService();
+        $years = $service->getSchoolYears();
+
+        $this->assertSame(['2025-2026', '2024-2025'], $years);
+    }
+
+    public function test_first_non_empty_returns_first_value(): void
+    {
+        $service = new AssignmentMetaService();
+        $value = $service->firstNonEmpty([null, '', 'Fall', 'Spring']);
+
+        $this->assertSame('Fall', $value);
+    }
+}
diff --git a/tests/Unit/Services/Assignment/AssignmentSectionServiceTest.php b/tests/Unit/Services/Assignment/AssignmentSectionServiceTest.php
new file mode 100644
index 00000000..99bcc032
--- /dev/null
+++ b/tests/Unit/Services/Assignment/AssignmentSectionServiceTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\Services\Assignment;
+
+use App\Models\ClassSection;
+use App\Services\Assignment\AssignmentSectionService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AssignmentSectionServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_section_names_map(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 101,
+            'class_section_name' => '1-A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new AssignmentSectionService(new ClassSection());
+        $map = $service->getSectionNamesMap([1]);
+
+        $this->assertSame('1-A', $map[1]);
+    }
+}
diff --git a/tests/Unit/Services/Attendance/AttendancePolicyServiceTest.php b/tests/Unit/Services/Attendance/AttendancePolicyServiceTest.php
index 2be55d2d..d525ecf0 100644
--- a/tests/Unit/Services/Attendance/AttendancePolicyServiceTest.php
+++ b/tests/Unit/Services/Attendance/AttendancePolicyServiceTest.php
@@ -3,55 +3,40 @@
 namespace Tests\Unit\Services\Attendance;
 
 use App\Services\Attendance\AttendancePolicyService;
-use PHPUnit\Framework\TestCase;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class AttendancePolicyServiceTest extends TestCase
 {
-    public function test_teacher_can_edit_draft_day(): void
+    use RefreshDatabase;
+
+    public function test_teacher_can_edit_draft(): void
     {
         $service = new AttendancePolicyService();
+        $allowed = $service->canEditDay(
+            ['status' => 'draft'],
+            ['roles' => ['Teacher'], 'permissions' => []]
+        );
 
-        $day = ['status' => 'draft'];
-        $user = [
-            'roles' => ['teacher'],
-            'permissions' => [],
-        ];
-
-        $this->assertTrue($service->canEditDay($day, $user));
+        $this->assertTrue($allowed);
     }
 
-    public function test_teacher_cannot_edit_finalized_day(): void
+    public function test_teacher_cannot_edit_finalized(): void
     {
         $service = new AttendancePolicyService();
+        $allowed = $service->canEditDay(
+            ['status' => 'finalized'],
+            ['roles' => ['Teacher'], 'permissions' => []]
+        );
 
-        $day = ['status' => 'finalized'];
-        $user = [
-            'roles' => ['teacher'],
-            'permissions' => [],
-        ];
-
-        $this->assertFalse($service->canEditDay($day, $user));
+        $this->assertFalse($allowed);
     }
 
-    public function test_admin_can_edit_finalized_day(): void
+    public function test_admin_like_by_permission(): void
     {
         $service = new AttendancePolicyService();
+        $isAdmin = $service->isAdminLike([], ['attendance.manage.daily']);
 
-        $day = ['status' => 'finalized'];
-        $user = [
-            'roles' => ['admin'],
-            'permissions' => [],
-        ];
-
-        $this->assertTrue($service->canEditDay($day, $user));
+        $this->assertTrue($isAdmin);
     }
-
-    public function test_is_admin_like_excludes_teacher_roles(): void
-    {
-        $service = new AttendancePolicyService();
-
-        $this->assertFalse($service->isAdminLike(['teacher']));
-        $this->assertFalse($service->isAdminLike(['teacher_assistant']));
-        $this->assertTrue($service->isAdminLike(['principal']));
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Attendance/AttendanceQueryServiceTest.php b/tests/Unit/Services/Attendance/AttendanceQueryServiceTest.php
new file mode 100644
index 00000000..06ccde48
--- /dev/null
+++ b/tests/Unit/Services/Attendance/AttendanceQueryServiceTest.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Tests\Unit\Services\Attendance;
+
+use App\Services\Attendance\AttendanceQueryService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class AttendanceQueryServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_teacher_grid_returns_section_labels_and_grid(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 10,
+            'class_section_name' => '1A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'class_section_id' => 10,
+            'teacher_id' => 1,
+            'position' => 'main',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('staff_attendance')->insert([
+            'user_id' => 1,
+            'role_name' => 'teacher',
+            'date' => '2025-01-05',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'status' => 'present',
+            'reason' => null,
+        ]);
+
+        $service = new AttendanceQueryService(
+            new \App\Models\Configuration(),
+            new \App\Models\AttendanceData(),
+            new \App\Models\AttendanceDay(),
+            new \App\Models\AttendanceRecord(),
+            new \App\Models\Student(),
+            new \App\Models\StudentClass(),
+            new \App\Models\ClassSection(),
+            new \App\Models\TeacherClass(),
+            new \App\Models\Calendar(),
+            new \App\Models\User(),
+            new \App\Models\UserRole(),
+            new \App\Services\Attendance\AttendanceService(
+                new \App\Models\Configuration(),
+                new \App\Models\AttendanceData(),
+                new \App\Models\AttendanceDay(),
+                new \App\Models\ClassSection(),
+                new \App\Models\UserRole(),
+                new \App\Services\Attendance\AttendancePolicyService(),
+                new \App\Services\Attendance\StudentAttendanceWriterService(
+                    new \App\Models\AttendanceData(),
+                    new \App\Models\Student(),
+                    new \App\Services\Attendance\AttendanceRecordSyncService(new \App\Models\AttendanceRecord())
+                ),
+                new \App\Services\Attendance\TeacherAttendanceSubmissionService(
+                    new \App\Models\AttendanceDay(),
+                    new \App\Models\AttendanceData(),
+                    new \App\Models\TeacherClass(),
+                    new \App\Models\Student(),
+                    new \App\Services\Attendance\AttendancePolicyService(),
+                    new \App\Services\Attendance\StudentAttendanceWriterService(
+                        new \App\Models\AttendanceData(),
+                        new \App\Models\Student(),
+                        new \App\Services\Attendance\AttendanceRecordSyncService(new \App\Models\AttendanceRecord())
+                    )
+                ),
+                new \App\Services\Attendance\AttendanceRecordSyncService(new \App\Models\AttendanceRecord())
+            ),
+            new \App\Services\Attendance\SemesterRangeService()
+        );
+
+        $grid = $service->teacherGrid('Fall', '2025-2026', '2025-01-05', 10);
+
+        $this->assertSame('1A', $grid['sections'][10]);
+        $this->assertSame(1, count($grid['grid']));
+        $this->assertSame('present', $grid['grid'][0]['status']);
+    }
+}
diff --git a/tests/Unit/Services/Attendance/AttendanceRecordSyncServiceTest.php b/tests/Unit/Services/Attendance/AttendanceRecordSyncServiceTest.php
index 8b917e0b..5b6fb40f 100644
--- a/tests/Unit/Services/Attendance/AttendanceRecordSyncServiceTest.php
+++ b/tests/Unit/Services/Attendance/AttendanceRecordSyncServiceTest.php
@@ -2,266 +2,46 @@
 
 namespace Tests\Unit\Services\Attendance;
 
-use App\Models\AttendanceRecord;
 use App\Services\Attendance\AttendanceRecordSyncService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 
 class AttendanceRecordSyncServiceTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected AttendanceRecordSyncService $service;
-
-    protected function setUp(): void
+    public function test_update_attendance_record_adjusts_totals(): void
     {
-        parent::setUp();
-
-        $this->service = app(AttendanceRecordSyncService::class);
-    }
-
-    public function test_update_attendance_record_increments_and_decrements_counters(): void
-    {
-        $record = AttendanceRecord::query()->create([
-            'class_section_id' => 10,
-            'student_id' => 200,
-            'school_id' => 'SCH-200',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
+        DB::table('attendance_record')->insert([
+            'class_section_id' => 1,
+            'student_id' => 10,
+            'school_id' => 'S1',
             'total_presence' => 5,
-            'total_absence' => 2,
-            'total_late' => 1,
+            'total_absence' => 1,
+            'total_late' => 2,
             'total_attendance' => 8,
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $this->service->updateAttendanceRecord(
-            studentId: 200,
-            schoolId: 'SCH-200',
-            newStatus: 'absent',
-            semester: 'Fall',
-            schoolYear: '2025-2026',
-            oldStatus: 'present',
-            modifiedBy: 99
-        );
-
-        $record->refresh();
-
-        $this->assertSame(4, (int)$record->total_presence);
-        $this->assertSame(3, (int)$record->total_absence);
-        $this->assertSame(1, (int)$record->total_late);
-        $this->assertSame(99, (int)$record->modified_by);
-    }
-
-    public function test_update_attendance_record_does_nothing_when_record_missing(): void
-    {
-        $this->service->updateAttendanceRecord(
-            studentId: 999,
-            schoolId: 'SCH-999',
-            newStatus: 'late',
-            semester: 'Fall',
-            schoolYear: '2025-2026',
-            oldStatus: 'present',
-            modifiedBy: 10
-        );
-
-        $this->assertDatabaseMissing('attendance_record', [
-            'student_id' => 999,
             'semester' => 'Fall',
             'school_year' => '2025-2026',
         ]);
+
+        $service = new AttendanceRecordSyncService(new \App\Models\AttendanceRecord());
+        $service->updateAttendanceRecord(10, 'S1', 'absent', 'Fall', '2025-2026', 'present', 1);
+
+        $row = DB::table('attendance_record')->where('student_id', 10)->first();
+        $this->assertSame(4, (int) $row->total_presence);
+        $this->assertSame(2, (int) $row->total_absence);
     }
 
-    public function test_update_attendance_record_never_goes_below_zero(): void
+    public function test_add_new_attendance_record_creates_row(): void
     {
-        $record = AttendanceRecord::query()->create([
-            'class_section_id' => 11,
-            'student_id' => 201,
-            'school_id' => 'SCH-201',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 0,
-            'total_absence' => 0,
-            'total_late' => 0,
-            'total_attendance' => 0,
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $this->service->updateAttendanceRecord(
-            studentId: 201,
-            schoolId: 'SCH-201',
-            newStatus: 'present',
-            semester: 'Fall',
-            schoolYear: '2025-2026',
-            oldStatus: 'absent',
-            modifiedBy: 5
-        );
-
-        $record->refresh();
-
-        $this->assertSame(1, (int)$record->total_presence);
-        $this->assertSame(0, (int)$record->total_absence);
-        $this->assertSame(0, (int)$record->total_late);
-    }
-
-    public function test_add_new_attendance_record_creates_record_when_missing(): void
-    {
-        $this->service->addNewAttendanceRecord(
-            classSectionId: 20,
-            studentId: 300,
-            schoolId: 'SCH-300',
-            status: 'late',
-            semester: 'Spring',
-            schoolYear: '2025-2026',
-            modifiedBy: 88
-        );
+        $service = new AttendanceRecordSyncService(new \App\Models\AttendanceRecord());
+        $service->addNewAttendanceRecord(1, 10, 'S1', 'present', 'Fall', '2025-2026', 1);
 
         $this->assertDatabaseHas('attendance_record', [
-            'class_section_id' => 20,
-            'student_id' => 300,
-            'school_id' => 'SCH-300',
-            'semester' => 'Spring',
-            'school_year' => '2025-2026',
-            'total_presence' => 0,
-            'total_absence' => 0,
-            'total_late' => 1,
-            'total_attendance' => 1,
-            'modified_by' => 88,
-        ]);
-    }
-
-    public function test_add_new_attendance_record_updates_existing_record(): void
-    {
-        $record = AttendanceRecord::query()->create([
-            'class_section_id' => 21,
-            'student_id' => 301,
-            'school_id' => 'SCH-301',
-            'semester' => 'Spring',
-            'school_year' => '2025-2026',
+            'student_id' => 10,
             'total_presence' => 1,
-            'total_absence' => 2,
-            'total_late' => 3,
-            'total_attendance' => 6,
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $this->service->addNewAttendanceRecord(
-            classSectionId: 21,
-            studentId: 301,
-            schoolId: 'SCH-301',
-            status: 'present',
-            semester: 'Spring',
-            schoolYear: '2025-2026',
-            modifiedBy: 77
-        );
-
-        $record->refresh();
-
-        $this->assertSame(2, (int)$record->total_presence);
-        $this->assertSame(2, (int)$record->total_absence);
-        $this->assertSame(3, (int)$record->total_late);
-        $this->assertSame(7, (int)$record->total_attendance);
-        $this->assertSame(77, (int)$record->modified_by);
-    }
-
-    public function test_upsert_attendance_record_totals_updates_existing_record(): void
-    {
-        $record = AttendanceRecord::query()->create([
-            'class_section_id' => 30,
-            'student_id' => 400,
-            'school_id' => 'SCH-400',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 0,
-            'total_absence' => 0,
-            'total_late' => 0,
-            'total_attendance' => 0,
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $result = $this->service->upsertAttendanceRecordTotals(
-            studentId: 400,
-            classSectionId: '30',
-            schoolId: 'SCH-400',
-            semester: 'Fall',
-            schoolYear: '2025-2026',
-            totalPresence: 7,
-            totalLate: 2,
-            totalAbsence: 1,
-            totalAttendance: 10,
-            modifiedBy: 44
-        );
-
-        $this->assertTrue($result);
-
-        $record->refresh();
-
-        $this->assertSame(7, (int)$record->total_presence);
-        $this->assertSame(2, (int)$record->total_late);
-        $this->assertSame(1, (int)$record->total_absence);
-        $this->assertSame(10, (int)$record->total_attendance);
-        $this->assertSame(44, (int)$record->modified_by);
-    }
-
-    public function test_upsert_attendance_record_totals_creates_new_record(): void
-    {
-        $result = $this->service->upsertAttendanceRecordTotals(
-            studentId: 401,
-            classSectionId: '31',
-            schoolId: 'SCH-401',
-            semester: 'Fall',
-            schoolYear: '2025-2026',
-            totalPresence: 3,
-            totalLate: 1,
-            totalAbsence: 2,
-            totalAttendance: 6,
-            modifiedBy: 55
-        );
-
-        $this->assertTrue($result);
-
-        $this->assertDatabaseHas('attendance_record', [
-            'student_id' => 401,
-            'class_section_id' => 31,
-            'school_id' => 'SCH-401',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 3,
-            'total_late' => 1,
-            'total_absence' => 2,
-            'total_attendance' => 6,
-            'modified_by' => 55,
+            'total_attendance' => 1,
         ]);
     }
-
-    public function test_upsert_attendance_record_totals_returns_false_when_semester_or_school_year_missing(): void
-    {
-        $result = $this->service->upsertAttendanceRecordTotals(
-            studentId: 402,
-            classSectionId: '32',
-            schoolId: 'SCH-402',
-            semester: '',
-            schoolYear: '',
-            totalPresence: 1,
-            totalLate: 1,
-            totalAbsence: 1,
-            totalAttendance: 3,
-            modifiedBy: 1
-        );
-
-        $this->assertFalse($result);
-
-        $this->assertDatabaseMissing('attendance_record', [
-            'student_id' => 402,
-            'school_id' => 'SCH-402',
-        ]);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Attendance/AttendanceSemesterRangeServiceTest.php b/tests/Unit/Services/Attendance/AttendanceSemesterRangeServiceTest.php
new file mode 100644
index 00000000..7c6d6a15
--- /dev/null
+++ b/tests/Unit/Services/Attendance/AttendanceSemesterRangeServiceTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Unit\Services\Attendance;
+
+use App\Services\Attendance\SemesterRangeService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AttendanceSemesterRangeServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_semester_range(): void
+    {
+        $service = new SemesterRangeService();
+        $range = $service->getSemesterRange('2025-2026', 'fall');
+
+        $this->assertSame(['2025-09-21', '2026-01-18'], $range);
+    }
+
+    public function test_build_sunday_list_returns_sundays(): void
+    {
+        $service = new SemesterRangeService();
+        $dates = $service->buildSundayList('2025-09-01', '2025-09-30');
+
+        $this->assertContains('2025-09-07', $dates);
+        $this->assertContains('2025-09-14', $dates);
+    }
+}
diff --git a/tests/Unit/Services/Attendance/AttendanceServiceTest.php b/tests/Unit/Services/Attendance/AttendanceServiceTest.php
new file mode 100644
index 00000000..11d9aefa
--- /dev/null
+++ b/tests/Unit/Services/Attendance/AttendanceServiceTest.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace Tests\Unit\Services\Attendance;
+
+use App\Models\AttendanceData;
+use App\Models\AttendanceDay;
+use App\Models\ClassSection;
+use App\Models\Configuration;
+use App\Models\User;
+use App\Models\UserRole;
+use App\Services\Attendance\AttendancePolicyService;
+use App\Services\Attendance\AttendanceRecordSyncService;
+use App\Services\Attendance\AttendanceService;
+use App\Services\Attendance\StudentAttendanceWriterService;
+use App\Services\Attendance\TeacherAttendanceSubmissionService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Mockery;
+use Tests\TestCase;
+
+class AttendanceServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_update_attendance_management_throws_when_locked(): void
+    {
+        $user = $this->seedUser();
+
+        $policy = Mockery::mock(AttendancePolicyService::class);
+        $policy->shouldReceive('canEditDay')->andReturn(false);
+
+        $writer = Mockery::mock(StudentAttendanceWriterService::class);
+        $teacherSubmission = Mockery::mock(TeacherAttendanceSubmissionService::class);
+        $recordSync = Mockery::mock(AttendanceRecordSyncService::class);
+
+        $service = new AttendanceService(
+            new Configuration(),
+            new AttendanceData(),
+            new AttendanceDay(),
+            new ClassSection(),
+            new UserRole(),
+            $policy,
+            $writer,
+            $teacherSubmission,
+            $recordSync
+        );
+
+        $this->expectException(\RuntimeException::class);
+        $service->updateAttendanceManagement($user, [
+            'class_section_id' => 1,
+            'student_id' => 1,
+            'status' => 'present',
+            'date' => '2025-01-01',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    public function test_update_attendance_management_saves_row(): void
+    {
+        $user = $this->seedUser();
+
+        $policy = Mockery::mock(AttendancePolicyService::class);
+        $policy->shouldReceive('canEditDay')->andReturn(true);
+
+        $writer = Mockery::mock(StudentAttendanceWriterService::class);
+        $writer->shouldReceive('saveOrUpdateStudentAttendance')->once();
+
+        $teacherSubmission = Mockery::mock(TeacherAttendanceSubmissionService::class);
+        $recordSync = Mockery::mock(AttendanceRecordSyncService::class);
+
+        $service = new AttendanceService(
+            new Configuration(),
+            new AttendanceData(),
+            new AttendanceDay(),
+            new ClassSection(),
+            new UserRole(),
+            $policy,
+            $writer,
+            $teacherSubmission,
+            $recordSync
+        );
+
+        $result = $service->updateAttendanceManagement($user, [
+            'class_section_id' => 1,
+            'student_id' => 1,
+            'status' => 'present',
+            'date' => '2025-01-01',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'class_id' => 1,
+        ]);
+
+        $this->assertTrue($result['ok']);
+        $this->assertDatabaseHas('attendance_day', [
+            'class_section_id' => 1,
+            'date' => '2025-01-01',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    private function seedUser(): User
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'test@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        return User::query()->findOrFail(1);
+    }
+}
diff --git a/tests/Unit/Services/Attendance/StaffAttendanceServiceTest.php b/tests/Unit/Services/Attendance/StaffAttendanceServiceTest.php
new file mode 100644
index 00000000..748191c6
--- /dev/null
+++ b/tests/Unit/Services/Attendance/StaffAttendanceServiceTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Tests\Unit\Services\Attendance;
+
+use App\Services\Attendance\StaffAttendanceService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class StaffAttendanceServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_month_data_returns_sections_and_days(): void
+    {
+        DB::table('configuration')->insert([
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 10,
+            'class_section_name' => '1A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'class_section_id' => 10,
+            'teacher_id' => 1,
+            'position' => 'main',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('staff_attendance')->insert([
+            'user_id' => 1,
+            'role_name' => 'teacher',
+            'date' => '2025-09-07',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'status' => 'present',
+            'reason' => null,
+        ]);
+
+        DB::table('calendar_events')->insert([
+            'title' => 'No School',
+            'date' => '2025-09-14',
+            'no_school' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new StaffAttendanceService(
+            new \App\Models\Configuration(),
+            new \App\Models\StaffAttendance(),
+            new \App\Models\TeacherClass(),
+            new \App\Models\ClassSection(),
+            new \App\Services\Attendance\SemesterRangeService()
+        );
+
+        $payload = $service->monthData('Fall', '2025-2026');
+
+        $this->assertNotEmpty($payload['sections']);
+        $this->assertContains('2025-09-14', $payload['noSchoolDays']);
+    }
+}
diff --git a/tests/Unit/Services/Attendance/StudentAttendanceWriterServiceTest.php b/tests/Unit/Services/Attendance/StudentAttendanceWriterServiceTest.php
index ce925874..55012fea 100644
--- a/tests/Unit/Services/Attendance/StudentAttendanceWriterServiceTest.php
+++ b/tests/Unit/Services/Attendance/StudentAttendanceWriterServiceTest.php
@@ -2,321 +2,90 @@
 
 namespace Tests\Unit\Services\Attendance;
 
-use App\Models\AttendanceData;
-use App\Models\AttendanceRecord;
-use App\Models\Student;
 use App\Services\Attendance\AttendanceRecordSyncService;
 use App\Services\Attendance\StudentAttendanceWriterService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use RuntimeException;
+use Illuminate\Support\Facades\DB;
+use Mockery;
 use Tests\TestCase;
 
 class StudentAttendanceWriterServiceTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected StudentAttendanceWriterService $service;
-
-    protected function setUp(): void
+    public function test_resolve_student_school_id_from_student(): void
     {
-        parent::setUp();
-
-        $this->service = app(StudentAttendanceWriterService::class);
-    }
-
-    public function test_resolve_student_school_id_returns_passed_value_when_present(): void
-    {
-        $result = $this->service->resolveStudentSchoolId(100, 'SCH-100');
-
-        $this->assertSame('SCH-100', $result);
-    }
-
-    public function test_resolve_student_school_id_fetches_from_database_when_missing(): void
-    {
-        Student::query()->create([
-            'id' => 101,
-            'firstname' => 'John',
-            'lastname' => 'Doe',
-            'school_id' => 'SCH-101',
-            'is_active' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Test',
+            'lastname' => 'Student',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
         ]);
 
-        $result = $this->service->resolveStudentSchoolId(101, null);
+        $sync = Mockery::mock(AttendanceRecordSyncService::class);
+        $service = new StudentAttendanceWriterService(new \App\Models\AttendanceData(), new \App\Models\Student(), $sync);
 
-        $this->assertSame('SCH-101', $result);
+        $this->assertSame('S1', $service->resolveStudentSchoolId(1, null));
     }
 
-    public function test_resolve_student_school_id_throws_when_student_missing(): void
+    public function test_save_or_update_updates_existing_and_syncs_record(): void
     {
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Student school ID not found.');
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Test',
+            'lastname' => 'Student',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+        ]);
 
-        $this->service->resolveStudentSchoolId(9999, null);
-    }
+        DB::table('attendance_data')->insert([
+            'class_id' => 1,
+            'class_section_id' => 1,
+            'student_id' => 1,
+            'school_id' => 'S1',
+            'date' => '2025-01-01',
+            'status' => 'present',
+            'is_reported' => 'no',
+            'is_notified' => 'no',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
 
-    public function test_insert_attendance_data_creates_new_row(): void
-    {
-        $this->service->insertAttendanceData(
-            classSectionId: 10,
-            studentId: 200,
-            studentSchoolId: 'SCH-200',
-            status: 'Absent',
-            reason: 'Sick',
-            reported: 'yes',
-            semester: 'Fall',
-            schoolYear: '2025-2026',
-            date: '2025-10-05',
-            classId: 5,
-            userId: 22
-        );
+        $sync = Mockery::mock(AttendanceRecordSyncService::class);
+        $sync->shouldReceive('updateAttendanceRecord')->once();
 
-        $this->assertDatabaseHas('attendance_data', [
-            'class_id' => 5,
-            'class_section_id' => 10,
-            'student_id' => 200,
-            'school_id' => 'SCH-200',
+        $service = new StudentAttendanceWriterService(new \App\Models\AttendanceData(), new \App\Models\Student(), $sync);
+
+        $service->saveOrUpdateStudentAttendance([
+            'class_section_id' => 1,
+            'student_id' => 1,
+            'school_id' => null,
             'status' => 'absent',
             'reason' => 'Sick',
             'is_reported' => 'yes',
-            'is_notified' => 'no',
             'semester' => 'Fall',
             'school_year' => '2025-2026',
-            'date' => '2025-10-05',
-            'modified_by' => 22,
+            'date' => '2025-01-01',
+            'class_id' => 1,
+            'user_id' => 1,
         ]);
-    }
-
-    public function test_update_attendance_data_updates_existing_row(): void
-    {
-        $row = AttendanceData::query()->create([
-            'class_id' => 6,
-            'class_section_id' => 12,
-            'student_id' => 201,
-            'school_id' => 'SCH-201',
-            'status' => 'present',
-            'reason' => null,
-            'is_reported' => 'no',
-            'is_notified' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-12',
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $this->service->updateAttendanceData(
-            attendanceId: $row->id,
-            newStatus: 'late',
-            newReason: 'Traffic',
-            reported: 'yes',
-            userId: 99
-        );
-
-        $row->refresh();
-
-        $this->assertSame('late', $row->status);
-        $this->assertSame('Traffic', $row->reason);
-        $this->assertSame('yes', $row->is_reported);
-        $this->assertSame(99, (int)$row->modified_by);
-    }
-
-    public function test_save_or_update_student_attendance_creates_new_attendance_and_record(): void
-    {
-        Student::query()->create([
-            'id' => 300,
-            'firstname' => 'Sara',
-            'lastname' => 'Smith',
-            'school_id' => 'SCH-300',
-            'is_active' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $result = $this->service->saveOrUpdateStudentAttendance([
-            'class_section_id' => 15,
-            'student_id' => 300,
-            'school_id' => null,
-            'status' => 'present',
-            'reason' => 'On time',
-            'is_reported' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-19',
-            'class_id' => 9,
-            'user_id' => 88,
-        ]);
-
-        $this->assertSame('created', $result['mode']);
-        $this->assertSame('present', $result['new_status']);
-        $this->assertSame('SCH-300', $result['school_id']);
 
         $this->assertDatabaseHas('attendance_data', [
-            'student_id' => 300,
-            'school_id' => 'SCH-300',
-            'status' => 'present',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-19',
-        ]);
-
-        $this->assertDatabaseHas('attendance_record', [
-            'student_id' => 300,
-            'school_id' => 'SCH-300',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 1,
-            'total_absence' => 0,
-            'total_late' => 0,
-            'total_attendance' => 1,
-            'modified_by' => 88,
-        ]);
-    }
-
-    public function test_save_or_update_student_attendance_updates_existing_attendance_and_record(): void
-    {
-        Student::query()->create([
-            'id' => 301,
-            'firstname' => 'Ali',
-            'lastname' => 'Khan',
-            'school_id' => 'SCH-301',
-            'is_active' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        AttendanceRecord::query()->create([
-            'class_section_id' => 16,
-            'student_id' => 301,
-            'school_id' => 'SCH-301',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 2,
-            'total_absence' => 0,
-            'total_late' => 0,
-            'total_attendance' => 2,
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $attendance = AttendanceData::query()->create([
-            'class_id' => 10,
-            'class_section_id' => 16,
-            'student_id' => 301,
-            'school_id' => 'SCH-301',
-            'status' => 'present',
-            'reason' => null,
-            'is_reported' => 'no',
-            'is_notified' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-26',
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $result = $this->service->saveOrUpdateStudentAttendance([
-            'class_section_id' => 16,
-            'student_id' => 301,
-            'school_id' => 'SCH-301',
+            'student_id' => 1,
             'status' => 'absent',
-            'reason' => 'Family trip',
+            'reason' => 'Sick',
             'is_reported' => 'yes',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-26',
-            'class_id' => 10,
-            'user_id' => 77,
-        ]);
-
-        $this->assertSame('updated', $result['mode']);
-        $this->assertSame('present', $result['old_status']);
-        $this->assertSame('absent', $result['new_status']);
-
-        $attendance->refresh();
-
-        $this->assertSame('absent', $attendance->status);
-        $this->assertSame('Family trip', $attendance->reason);
-        $this->assertSame('yes', $attendance->is_reported);
-        $this->assertSame(77, (int)$attendance->modified_by);
-
-        $this->assertDatabaseHas('attendance_record', [
-            'student_id' => 301,
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 1,
-            'total_absence' => 1,
-            'total_late' => 0,
         ]);
     }
-
-    public function test_save_or_update_student_attendance_updates_existing_without_counter_change_when_status_same(): void
-    {
-        Student::query()->create([
-            'id' => 302,
-            'firstname' => 'Mona',
-            'lastname' => 'Lee',
-            'school_id' => 'SCH-302',
-            'is_active' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $record = AttendanceRecord::query()->create([
-            'class_section_id' => 17,
-            'student_id' => 302,
-            'school_id' => 'SCH-302',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'total_presence' => 4,
-            'total_absence' => 1,
-            'total_late' => 0,
-            'total_attendance' => 5,
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        AttendanceData::query()->create([
-            'class_id' => 11,
-            'class_section_id' => 17,
-            'student_id' => 302,
-            'school_id' => 'SCH-302',
-            'status' => 'present',
-            'reason' => null,
-            'is_reported' => 'no',
-            'is_notified' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-11-02',
-            'modified_by' => 1,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $this->service->saveOrUpdateStudentAttendance([
-            'class_section_id' => 17,
-            'student_id' => 302,
-            'school_id' => 'SCH-302',
-            'status' => 'present',
-            'reason' => 'Still present',
-            'is_reported' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-11-02',
-            'class_id' => 11,
-            'user_id' => 66,
-        ]);
-
-        $record->refresh();
-
-        $this->assertSame(4, (int)$record->total_presence);
-        $this->assertSame(1, (int)$record->total_absence);
-        $this->assertSame(0, (int)$record->total_late);
-        $this->assertSame(5, (int)$record->total_attendance);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Attendance/TeacherAttendanceSubmissionServiceTest.php b/tests/Unit/Services/Attendance/TeacherAttendanceSubmissionServiceTest.php
index 6cb5b593..fcf4f6db 100644
--- a/tests/Unit/Services/Attendance/TeacherAttendanceSubmissionServiceTest.php
+++ b/tests/Unit/Services/Attendance/TeacherAttendanceSubmissionServiceTest.php
@@ -2,544 +2,80 @@
 
 namespace Tests\Unit\Services\Attendance;
 
-use App\Models\AttendanceData;
-use App\Models\AttendanceDay;
-use App\Models\Student;
-use App\Models\TeacherClass;
 use App\Models\User;
-use App\Services\Attendance\AttendancePolicyService;
-use App\Services\Attendance\StudentAttendanceWriterService;
 use App\Services\Attendance\TeacherAttendanceSubmissionService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
 use Mockery;
-use RuntimeException;
 use Tests\TestCase;
 
 class TeacherAttendanceSubmissionServiceTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function tearDown(): void
-    {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    protected function makeService(
-        ?AttendanceDay $attendanceDay = null,
-        ?AttendanceData $attendanceData = null,
-        mixed $teacherClass = null,
-        ?Student $student = null,
-        mixed $attendancePolicyService = null,
-        mixed $studentAttendanceWriterService = null
-    ): TeacherAttendanceSubmissionService {
-        return new TeacherAttendanceSubmissionService(
-            $attendanceDay ?? app(AttendanceDay::class),
-            $attendanceData ?? app(AttendanceData::class),
-            $teacherClass ?? app(TeacherClass::class),
-            $student ?? app(Student::class),
-            $attendancePolicyService ?? app(AttendancePolicyService::class),
-            $studentAttendanceWriterService ?? app(StudentAttendanceWriterService::class),
-        );
-    }
-
-    public function test_submit_throws_when_class_section_missing(): void
-    {
-        $service = $this->makeService();
-
-        $user = User::factory()->create();
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Missing or invalid class section.');
-
-        $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '',
-                'attendance' => [],
-                'teachers' => [],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-    }
-
-    public function test_submit_throws_when_section_not_found(): void
-    {
-        $service = $this->makeService();
-        $user = User::factory()->create();
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Invalid class section.');
-
-        $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '999999',
-                'attendance' => [['student_id' => 1, 'status' => 'present']],
-                'teachers' => [1 => ['status' => 'present']],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-    }
-
-    public function test_submit_throws_when_student_attendance_missing(): void
+    public function test_submit_requires_attendance_data(): void
     {
         DB::table('classSection')->insert([
             'id' => 1,
-            'class_id' => 5,
-            'class_section_id' => 100,
+            'class_id' => 1,
+            'class_section_id' => 10,
+            'class_section_name' => '1A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
         ]);
 
-        $teacherClassMock = Mockery::mock(TeacherClass::class);
-        $teacherClassMock->shouldReceive('assignedForSectionTerm')
-            ->once()
-            ->andReturn([
-                [
-                    'teacher_id' => 55,
-                    'position' => 'main',
-                    'firstname' => 'Main',
-                    'lastname' => 'Teacher',
-                ],
-            ]);
+        $user = $this->seedUser();
 
-        $policyMock = Mockery::mock(AttendancePolicyService::class);
-        $policyMock->shouldReceive('canEditDay')->once()->andReturnTrue();
+        $policy = Mockery::mock(\App\Services\Attendance\AttendancePolicyService::class);
+        $policy->shouldReceive('canEditDay')->andReturn(true);
 
-        $writerMock = Mockery::mock(StudentAttendanceWriterService::class);
-
-        $service = $this->makeService(
-            teacherClass: $teacherClassMock,
-            attendancePolicyService: $policyMock,
-            studentAttendanceWriterService: $writerMock
+        $service = new TeacherAttendanceSubmissionService(
+            new \App\Models\AttendanceDay(),
+            new \App\Models\AttendanceData(),
+            new \App\Models\TeacherClass(),
+            new \App\Models\Student(),
+            $policy,
+            new \App\Services\Attendance\StudentAttendanceWriterService(
+                new \App\Models\AttendanceData(),
+                new \App\Models\Student(),
+                new \App\Services\Attendance\AttendanceRecordSyncService(new \App\Models\AttendanceRecord())
+            )
         );
 
-        $user = User::factory()->create();
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('No student attendance data provided.');
+        $this->expectException(\RuntimeException::class);
 
         $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '100',
-                'attendance' => [],
-                'teachers' => [55 => ['status' => 'present']],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
+            $user,
+            ['class_section_id' => 10],
+            fn () => false,
+            fn () => 'Fall',
+            fn () => '2025-2026'
         );
     }
 
-    public function test_submit_throws_when_teacher_attendance_missing(): void
+    private function seedUser(): User
     {
-        DB::table('classSection')->insert([
-            'id' => 2,
-            'class_id' => 6,
-            'class_section_id' => 101,
-        ]);
-
-        $service = $this->makeService();
-        $user = User::factory()->create();
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('No teacher attendance data provided.');
-
-        $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '101',
-                'attendance' => [
-                    ['student_id' => 1, 'status' => 'present'],
-                ],
-                'teachers' => [],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-    }
-
-    public function test_submit_throws_when_policy_denies_edit(): void
-    {
-        DB::table('classSection')->insert([
-            'id' => 3,
-            'class_id' => 7,
-            'class_section_id' => 102,
-        ]);
-
-        $teacherClassMock = Mockery::mock(TeacherClass::class);
-        $teacherClassMock->shouldReceive('assignedForSectionTerm')->never();
-
-        $policyMock = Mockery::mock(AttendancePolicyService::class);
-        $policyMock->shouldReceive('canEditDay')->once()->andReturnFalse();
-
-        $writerMock = Mockery::mock(StudentAttendanceWriterService::class);
-
-        $service = $this->makeService(
-            teacherClass: $teacherClassMock,
-            attendancePolicyService: $policyMock,
-            studentAttendanceWriterService: $writerMock
-        );
-
-        $user = User::factory()->create();
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Attendance is locked for your role.');
-
-        $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '102',
-                'attendance' => [
-                    ['student_id' => 1, 'status' => 'present'],
-                ],
-                'teachers' => [
-                    55 => ['status' => 'present'],
-                ],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-    }
-
-    public function test_submit_throws_when_assigned_teacher_status_missing_or_invalid(): void
-    {
-        DB::table('classSection')->insert([
-            'id' => 4,
-            'class_id' => 8,
-            'class_section_id' => 103,
-        ]);
-
-        $teacherClassMock = Mockery::mock(TeacherClass::class);
-        $teacherClassMock->shouldReceive('assignedForSectionTerm')
-            ->once()
-            ->andReturn([
-                [
-                    'teacher_id' => 77,
-                    'position' => 'main',
-                    'firstname' => 'Main',
-                    'lastname' => 'Teacher',
-                ],
-            ]);
-
-        $policyMock = Mockery::mock(AttendancePolicyService::class);
-        $policyMock->shouldReceive('canEditDay')->once()->andReturnTrue();
-
-        $writerMock = Mockery::mock(StudentAttendanceWriterService::class);
-
-        $service = $this->makeService(
-            teacherClass: $teacherClassMock,
-            attendancePolicyService: $policyMock,
-            studentAttendanceWriterService: $writerMock
-        );
-
-        $user = User::factory()->create();
-
-        $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Please fill teacher attendance for all assigned teachers.');
-
-        $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '103',
-                'attendance' => [
-                    ['student_id' => 1, 'status' => 'present'],
-                ],
-                'teachers' => [
-                    77 => ['status' => ''],
-                ],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-    }
-
-    public function test_submit_saves_teacher_staff_attendance_and_student_rows(): void
-    {
-        DB::table('classSection')->insert([
-            'id' => 5,
-            'class_id' => 9,
-            'class_section_id' => 104,
-        ]);
-
-        $teacherClassMock = Mockery::mock(TeacherClass::class);
-        $teacherClassMock->shouldReceive('assignedForSectionTerm')
-            ->once()
-            ->andReturn([
-                [
-                    'teacher_id' => 88,
-                    'position' => 'main',
-                    'firstname' => 'Lead',
-                    'lastname' => 'Teacher',
-                ],
-                [
-                    'teacher_id' => 89,
-                    'position' => 'ta',
-                    'firstname' => 'Assist',
-                    'lastname' => 'Teacher',
-                ],
-            ]);
-
-        $policyMock = Mockery::mock(AttendancePolicyService::class);
-        $policyMock->shouldReceive('canEditDay')->once()->andReturnTrue();
-        $policyMock->shouldReceive('isTeacher')->once()->andReturnTrue();
-
-        $writerMock = Mockery::mock(StudentAttendanceWriterService::class);
-        $writerMock->shouldReceive('saveOrUpdateStudentAttendance')
-            ->twice()
-            ->withArgs(function (array $payload) {
-                return in_array($payload['student_id'], [501, 502], true)
-                    && $payload['class_section_id'] === 104
-                    && $payload['class_id'] === 9
-                    && $payload['semester'] === 'Fall'
-                    && $payload['school_year'] === '2025-2026';
-            })
-            ->andReturn(['mode' => 'created']);
-
-        $service = $this->makeService(
-            teacherClass: $teacherClassMock,
-            attendancePolicyService: $policyMock,
-            studentAttendanceWriterService: $writerMock
-        );
-
-        $user = User::factory()->create();
-
-        $result = $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '104',
-                'date' => '2025-10-05',
-                'attendance' => [
-                    [
-                        'student_id' => 501,
-                        'school_id' => 'SCH-501',
-                        'status' => 'present',
-                        'reason' => '',
-                    ],
-                    [
-                        'student_id' => 502,
-                        'school_id' => 'SCH-502',
-                        'status' => 'late',
-                        'reason' => 'Bus delay',
-                    ],
-                ],
-                'teachers' => [
-                    88 => ['status' => 'present', 'reason' => null],
-                    89 => ['status' => 'late', 'reason' => 'Traffic'],
-                ],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => false, 'source' => null],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-
-        $this->assertSame(['ok' => true, 'message' => 'Attendance submitted successfully.'], $result);
-
-        $this->assertDatabaseHas('staff_attendance', [
-            'user_id' => 88,
-            'date' => '2025-10-05',
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
             'semester' => 'Fall',
             'school_year' => '2025-2026',
-            'class_section_id' => 104,
-            'position' => 'main',
-            'status' => 'present',
         ]);
 
-        $this->assertDatabaseHas('staff_attendance', [
-            'user_id' => 89,
-            'date' => '2025-10-05',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'class_section_id' => 104,
-            'position' => 'ta',
-            'status' => 'late',
-            'reason' => 'Traffic',
-        ]);
-
-        $this->assertDatabaseHas('attendance_day', [
-            'class_section_id' => 104,
-            'date' => '2025-10-05',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'status' => 'submitted',
-            'submitted_by' => $user->id,
-        ]);
+        return User::query()->findOrFail(1);
     }
-
-    public function test_submit_skips_locked_existing_student_rows_for_teacher(): void
-    {
-        DB::table('classSection')->insert([
-            'id' => 6,
-            'class_id' => 10,
-            'class_section_id' => 105,
-        ]);
-
-        AttendanceData::query()->create([
-            'class_id' => 10,
-            'class_section_id' => 105,
-            'student_id' => 601,
-            'school_id' => 'SCH-601',
-            'status' => 'absent',
-            'reason' => 'Parent reported',
-            'is_reported' => 'yes',
-            'is_notified' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-12',
-            'modified_by' => 2,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $teacherClassMock = Mockery::mock(TeacherClass::class);
-        $teacherClassMock->shouldReceive('assignedForSectionTerm')
-            ->once()
-            ->andReturn([
-                [
-                    'teacher_id' => 90,
-                    'position' => 'main',
-                    'firstname' => 'Lead',
-                    'lastname' => 'Teacher',
-                ],
-            ]);
-
-        $policyMock = Mockery::mock(AttendancePolicyService::class);
-        $policyMock->shouldReceive('canEditDay')->once()->andReturnTrue();
-        $policyMock->shouldReceive('isTeacher')->once()->andReturnTrue();
-
-        $writerMock = Mockery::mock(StudentAttendanceWriterService::class);
-        $writerMock->shouldNotReceive('saveOrUpdateStudentAttendance');
-
-        $service = $this->makeService(
-            teacherClass: $teacherClassMock,
-            attendancePolicyService: $policyMock,
-            studentAttendanceWriterService: $writerMock
-        );
-
-        $user = User::factory()->create();
-
-        $result = $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '105',
-                'date' => '2025-10-12',
-                'attendance' => [
-                    [
-                        'student_id' => 601,
-                        'school_id' => 'SCH-601',
-                        'status' => 'present',
-                        'reason' => '',
-                    ],
-                ],
-                'teachers' => [
-                    90 => ['status' => 'present', 'reason' => null],
-                ],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => true, 'source' => 'parent'],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-
-        $this->assertTrue($result['ok']);
-
-        $this->assertDatabaseHas('attendance_day', [
-            'class_section_id' => 105,
-            'date' => '2025-10-12',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'status' => 'submitted',
-        ]);
-    }
-
-    public function test_submit_allows_non_teacher_context_to_write_existing_rows(): void
-    {
-        DB::table('classSection')->insert([
-            'id' => 7,
-            'class_id' => 11,
-            'class_section_id' => 106,
-        ]);
-
-        AttendanceData::query()->create([
-            'class_id' => 11,
-            'class_section_id' => 106,
-            'student_id' => 701,
-            'school_id' => 'SCH-701',
-            'status' => 'absent',
-            'reason' => 'Parent reported',
-            'is_reported' => 'yes',
-            'is_notified' => 'no',
-            'semester' => 'Fall',
-            'school_year' => '2025-2026',
-            'date' => '2025-10-19',
-            'modified_by' => 2,
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        $teacherClassMock = Mockery::mock(TeacherClass::class);
-        $teacherClassMock->shouldReceive('assignedForSectionTerm')
-            ->once()
-            ->andReturn([
-                [
-                    'teacher_id' => 91,
-                    'position' => 'main',
-                    'firstname' => 'Lead',
-                    'lastname' => 'Teacher',
-                ],
-            ]);
-
-        $policyMock = Mockery::mock(AttendancePolicyService::class);
-        $policyMock->shouldReceive('canEditDay')->once()->andReturnTrue();
-        $policyMock->shouldReceive('isTeacher')->once()->andReturnFalse();
-
-        $writerMock = Mockery::mock(StudentAttendanceWriterService::class);
-        $writerMock->shouldReceive('saveOrUpdateStudentAttendance')
-            ->once()
-            ->withArgs(function (array $payload) {
-                return $payload['student_id'] === 701
-                    && $payload['class_section_id'] === 106
-                    && $payload['class_id'] === 11;
-            })
-            ->andReturn(['mode' => 'updated']);
-
-        $service = $this->makeService(
-            teacherClass: $teacherClassMock,
-            attendancePolicyService: $policyMock,
-            studentAttendanceWriterService: $writerMock
-        );
-
-        $user = User::factory()->create();
-
-        $result = $service->submit(
-            user: $user,
-            data: [
-                'class_section_id' => '106',
-                'date' => '2025-10-19',
-                'attendance' => [
-                    [
-                        'student_id' => 701,
-                        'school_id' => 'SCH-701',
-                        'status' => 'present',
-                        'reason' => '',
-                    ],
-                ],
-                'teachers' => [
-                    91 => ['status' => 'present', 'reason' => null],
-                ],
-            ],
-            detectExternalSubmission: fn (?array $row) => ['locked' => true, 'source' => 'parent'],
-            currentSemester: fn () => 'Fall',
-            currentSchoolYear: fn () => '2025-2026'
-        );
-
-        $this->assertTrue($result['ok']);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceCaseQueryServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceCaseQueryServiceTest.php
index e8cc8e35..ec522757 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceCaseQueryServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceCaseQueryServiceTest.php
@@ -2,44 +2,28 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Models\AttendanceTracking;
-use App\Models\Student;
-use App\Services\AttendanceCaseQueryService;
-use App\Services\AttendanceParentLookupService;
-use App\Services\ViolationRuleEngineService;
+use App\Services\AttendanceTracking\AttendanceCaseQueryService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Mockery;
 use Tests\TestCase;
 
 class AttendanceCaseQueryServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_returns_not_found_when_student_missing(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    public function test_get_student_case_returns_404_when_student_not_found(): void
-    {
-        $student = Mockery::mock(Student::class);
-        $student->shouldReceive('query->find')->with(99)->andReturn(null);
-
-        $attendanceData = Mockery::mock(AttendanceData::class);
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $rules = Mockery::mock(ViolationRuleEngineService::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
         $service = new AttendanceCaseQueryService(
-            $student,
-            $attendanceData,
-            $tracking,
-            $rules,
-            $parents
+            new \App\Models\Student(),
+            new \App\Models\AttendanceData(),
+            new \App\Models\AttendanceTracking(),
+            Mockery::mock(\App\Services\AttendanceTracking\ViolationRuleEngineService::class),
+            Mockery::mock(\App\Services\AttendanceTracking\AttendanceParentLookupService::class)
         );
 
-        $result = $service->getStudentCase(99);
+        $result = $service->getStudentCase(999);
 
         $this->assertFalse($result['success']);
         $this->assertSame(404, $result['status']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceCommunicationSupportServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceCommunicationSupportServiceTest.php
index 68aad4cc..81ca8b92 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceCommunicationSupportServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceCommunicationSupportServiceTest.php
@@ -2,72 +2,62 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Models\Configuration;
-use App\Models\Student;
-use App\Services\AttendanceCommunicationSupportService;
-use App\Services\AttendanceEmailComposerService;
-use App\Services\AttendanceParentLookupService;
+use App\Services\AttendanceTracking\AttendanceCommunicationSupportService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Mockery;
 use Tests\TestCase;
 
 class AttendanceCommunicationSupportServiceTest extends TestCase
 {
-    protected function tearDown(): void
-    {
-        Mockery::close();
-        parent::tearDown();
-    }
+    use RefreshDatabase;
 
-    protected function makeService(
-        ?Student $student = null,
-        ?AttendanceData $attendanceData = null,
-        ?Configuration $config = null,
-        ?AttendanceParentLookupService $parents = null,
-        ?AttendanceEmailComposerService $composer = null
-    ): AttendanceCommunicationSupportService {
-        $student ??= Mockery::mock(Student::class);
-        $attendanceData ??= Mockery::mock(AttendanceData::class);
-        $config ??= Mockery::mock(Configuration::class);
-        $parents ??= Mockery::mock(AttendanceParentLookupService::class);
-        $composer ??= Mockery::mock(AttendanceEmailComposerService::class);
-
-        $config->shouldReceive('getConfig')->with('semester')->andReturn('Fall');
-        $config->shouldReceive('getConfig')->with('school_year')->andReturn('2025-2026');
-
-        return new AttendanceCommunicationSupportService(
-            $student,
-            $attendanceData,
-            $config,
-            $parents,
-            $composer
-        );
-    }
-
-    public function test_compose_returns_422_when_student_id_missing(): void
+    public function test_compose_requires_student_id(): void
     {
         $service = $this->makeService();
-
         $result = $service->compose(0);
 
         $this->assertFalse($result['success']);
         $this->assertSame(422, $result['status']);
     }
 
-    public function test_parents_info_delegates_to_parent_lookup_service(): void
+    public function test_get_violation_dates_for_student(): void
     {
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-        $parents->shouldReceive('parentsInfo')
-            ->once()
-            ->with(20, '2025-2026')
-            ->andReturn(['success' => true, 'data' => ['primary' => [], 'secondary' => []]]);
+        DB::table('configuration')->insert([
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+        ]);
 
-        $service = $this->makeService(
-            parents: $parents
-        );
+        DB::table('attendance_data')->insert([
+            'class_id' => 1,
+            'class_section_id' => 1,
+            'student_id' => 1,
+            'school_id' => 'S1',
+            'date' => '2025-01-01',
+            'status' => 'absent',
+            'is_reported' => 'no',
+            'is_notified' => 'no',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
 
-        $result = $service->parentsInfo(20);
+        $service = $this->makeService();
+        $dates = $service->getViolationDatesForStudent(1, 'ABS_1');
 
-        $this->assertTrue($result['success']);
+        $this->assertSame(['2025-01-01'], $dates);
     }
-}
\ No newline at end of file
+
+    private function makeService(): AttendanceCommunicationSupportService
+    {
+        $parentLookup = Mockery::mock(\App\Services\AttendanceTracking\AttendanceParentLookupService::class);
+        $emailComposer = Mockery::mock(\App\Services\AttendanceTracking\AttendanceEmailComposerService::class);
+
+        return new AttendanceCommunicationSupportService(
+            new \App\Models\Student(),
+            new \App\Models\AttendanceData(),
+            new \App\Models\Configuration(),
+            $parentLookup,
+            $emailComposer
+        );
+    }
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceEmailComposerServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceEmailComposerServiceTest.php
index 55e2de69..ca5eb145 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceEmailComposerServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceEmailComposerServiceTest.php
@@ -2,124 +2,37 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceEmailTemplate;
-use App\Services\AttendanceEmailComposerService;
-use Mockery;
+use App\Services\AttendanceTracking\AttendanceEmailComposerService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 
 class AttendanceEmailComposerServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_render_template_replaces_tokens(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    public function test_build_template_context_returns_expected_placeholders(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
-        $context = $service->buildTemplateContext(
-            [
-                'name' => 'John Doe',
-                'last_date' => '2026-03-01',
-            ],
-            [
-                'parent_name' => 'Jane Doe',
-                'phone' => '555-1212',
-            ]
-        );
-
-        $this->assertSame('Jane Doe', $context['{{parent_name}}']);
-        $this->assertSame('John Doe', $context['{{student_name}}']);
-        $this->assertSame('2026-03-01', $context['{{incident_date}}']);
-        $this->assertSame('555-1212', $context['{{voicemail_phone}}']);
-    }
-
-    public function test_render_template_uses_model_get_template(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $model->shouldReceive('getTemplate')
-            ->once()
-            ->with('ABS_1', 'default')
-            ->andReturn([
-                'subject' => 'Notice for {{student_name}}',
-                'body_html' => '<p>Date: {{incident_date}}</p>',
-            ]);
-
-        $service = new AttendanceEmailComposerService($model);
-
-        $rendered = $service->renderTemplate('ABS_1', 'default', [
-            '{{student_name}}' => 'John Doe',
-            '{{incident_date}}' => '2026-03-01',
+        DB::table('email_templates')->insert([
+            'code' => 'ABS_1',
+            'variant' => 'default',
+            'subject' => 'Notice for {{student_name}}',
+            'body_html' => '<p>{{parent_name}}</p>',
+            'is_active' => 1,
         ]);
 
-        $this->assertSame(
-            ['Notice for John Doe', '<p>Date: 2026-03-01</p>'],
-            $rendered
-        );
+        $service = new AttendanceEmailComposerService(new \App\Models\AttendanceEmailTemplate());
+        $context = ['{{student_name}}' => 'Student A', '{{parent_name}}' => 'Parent A'];
+        $rendered = $service->renderTemplate('ABS_1', 'default', $context);
+
+        $this->assertSame('Notice for Student A', $rendered[0]);
+        $this->assertSame('<p>Parent A</p>', $rendered[1]);
     }
 
-    public function test_pick_variant_returns_override_when_present(): void
+    public function test_pick_variant_fallback(): void
     {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
-        $this->assertSame('custom_variant', $service->pickVariant('ABS_2', 'custom_variant'));
-    }
-
-    public function test_pick_variant_returns_no_answer_for_abs_2(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
+        $service = new AttendanceEmailComposerService(new \App\Models\AttendanceEmailTemplate());
         $this->assertSame('no_answer', $service->pickVariant('ABS_2'));
-    }
-
-    public function test_pick_variant_returns_default_for_other_codes(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
         $this->assertSame('default', $service->pickVariant('ABS_1'));
     }
-
-    public function test_normalize_body_to_html_keeps_html_when_tags_present(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
-        $body = '<p>Hello</p>';
-        $this->assertSame($body, $service->normalizeBodyToHtml($body));
-    }
-
-    public function test_normalize_body_to_html_converts_plain_text_to_br_html(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
-        $result = $service->normalizeBodyToHtml("Hello\nWorld");
-
-        $this->assertStringContainsString('Hello', $result);
-        $this->assertStringContainsString('<br', $result);
-        $this->assertStringContainsString('World', $result);
-    }
-
-    public function test_build_fallback_auto_email_returns_subject_and_body(): void
-    {
-        $model = Mockery::mock(AttendanceEmailTemplate::class);
-        $service = new AttendanceEmailComposerService($model);
-
-        [$subject, $body] = $service->buildFallbackAutoEmail('ABS_1', [
-            'name' => 'John Doe',
-            'violation' => '1 Unreported Absence',
-            'last_date' => '2026-03-01',
-        ], 'Jane Doe');
-
-        $this->assertSame('Attendance Notice: Unreported Absence', $subject);
-        $this->assertStringContainsString('John Doe', $body);
-        $this->assertStringContainsString('2026-03-01', $body);
-        $this->assertStringContainsString('Jane Doe', $body);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceNotificationLogServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceNotificationLogServiceTest.php
index e405bb5c..7efdb6f3 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceNotificationLogServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceNotificationLogServiceTest.php
@@ -2,45 +2,32 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\ParentNotification;
-use App\Services\AttendanceNotificationLogService;
-use Mockery;
+use App\Services\AttendanceTracking\AttendanceNotificationLogService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 
 class AttendanceNotificationLogServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_log_notification_creates_and_updates(): void
     {
-        Mockery::close();
-        parent::tearDown();
+        $service = new AttendanceNotificationLogService(new \App\Models\ParentNotification());
+
+        $service->logNotification(1, 'ABS_1', '2025-01-01', 'email', 'parent@example.com', 'Subject', 'sent');
+        $this->assertDatabaseHas('parent_notifications', [
+            'student_id' => 1,
+            'code' => 'ABS_1',
+            'incident_date' => '2025-01-01',
+            'channel' => 'email',
+            'to_address' => 'parent@example.com',
+            'status' => 'sent',
+        ]);
+
+        $service->logNotification(1, 'ABS_1', '2025-01-01', 'email', 'parent@example.com', 'Updated', 'failed');
+        $row = DB::table('parent_notifications')->where('student_id', 1)->first();
+        $this->assertSame('Updated', $row->subject);
+        $this->assertSame('failed', $row->status);
     }
-
-    public function test_notification_already_sent_returns_true_when_model_has_sent_returns_true(): void
-    {
-        $model = Mockery::mock(ParentNotification::class);
-        $model->shouldReceive('hasSent')
-            ->once()
-            ->with(10, 'ABS_1', '2026-03-01', 'email', 'parent@example.com')
-            ->andReturn(true);
-
-        $service = new AttendanceNotificationLogService($model);
-
-        $this->assertTrue(
-            $service->notificationAlreadySent(10, 'ABS_1', '2026-03-01', 'email', 'parent@example.com')
-        );
-    }
-
-    public function test_notification_already_sent_returns_false_when_model_has_sent_returns_false(): void
-    {
-        $model = Mockery::mock(ParentNotification::class);
-        $model->shouldReceive('hasSent')
-            ->once()
-            ->andReturn(false);
-
-        $service = new AttendanceNotificationLogService($model);
-
-        $this->assertFalse(
-            $service->notificationAlreadySent(10, 'ABS_1', '2026-03-01', 'email', 'parent@example.com')
-        );
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceNotificationWorkflowServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceNotificationWorkflowServiceTest.php
index 4e8e6c10..7bfefd21 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceNotificationWorkflowServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceNotificationWorkflowServiceTest.php
@@ -2,114 +2,50 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Models\AttendanceTracking;
-use App\Models\Configuration;
-use App\Models\Student;
-use App\Models\StudentClass;
-use App\Services\AttendanceEmailComposerService;
-use App\Services\AttendanceMailerService;
-use App\Services\AttendanceNotificationLogService;
-use App\Services\AttendanceNotificationWorkflowService;
-use App\Services\AttendanceParentLookupService;
-use App\Services\ViolationRuleEngineService;
+use App\Services\AttendanceTracking\AttendanceNotificationWorkflowService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Mockery;
 use Tests\TestCase;
 
 class AttendanceNotificationWorkflowServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_record_requires_parent_email(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
-
-    protected function makeService(
-        ?Student $student = null,
-        ?StudentClass $studentClass = null,
-        ?AttendanceData $attendanceData = null,
-        ?AttendanceTracking $tracking = null,
-        ?Configuration $config = null,
-        ?AttendanceMailerService $mailer = null,
-        ?ViolationRuleEngineService $rules = null,
-        ?AttendanceParentLookupService $parents = null,
-        ?AttendanceEmailComposerService $composer = null,
-        ?AttendanceNotificationLogService $log = null
-    ): AttendanceNotificationWorkflowService {
-        $student ??= Mockery::mock(Student::class);
-        $studentClass ??= Mockery::mock(StudentClass::class);
-        $attendanceData ??= Mockery::mock(AttendanceData::class);
-        $tracking ??= Mockery::mock(AttendanceTracking::class);
-        $config ??= Mockery::mock(Configuration::class);
-        $mailer ??= Mockery::mock(AttendanceMailerService::class);
-        $rules ??= Mockery::mock(ViolationRuleEngineService::class);
-        $parents ??= Mockery::mock(AttendanceParentLookupService::class);
-        $composer ??= Mockery::mock(AttendanceEmailComposerService::class);
-        $log ??= Mockery::mock(AttendanceNotificationLogService::class);
-
-        $config->shouldReceive('getConfig')->with('semester')->andReturn('Fall');
-        $config->shouldReceive('getConfig')->with('school_year')->andReturn('2025-2026');
-
-        return new AttendanceNotificationWorkflowService(
-            $student,
-            $studentClass,
-            $attendanceData,
-            $tracking,
-            $config,
-            $mailer,
-            $rules,
-            $parents,
-            $composer,
-            $log
-        );
-    }
-
-    public function test_send_auto_emails_returns_empty_summary_when_no_auto_email_violations(): void
-    {
-        $service = $this->makeService();
-
-        $result = $service->sendAutoEmails([
-            ['action' => 'team_notify'],
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
         ]);
 
-        $this->assertTrue($result['success']);
-        $this->assertSame(0, $result['sent']);
-        $this->assertSame(0, $result['skipped']);
-        $this->assertSame(0, $result['errors']);
-    }
-
-    public function test_send_email_manual_returns_failure_when_all_sends_fail(): void
-    {
-        $mailer = Mockery::mock(AttendanceMailerService::class);
-        $mailer->shouldReceive('send')->andReturn(false);
-
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-        $parents->shouldReceive('getSecondaryParentForStudent')->andReturn(null);
-
-        $composer = Mockery::mock(AttendanceEmailComposerService::class);
-        $composer->shouldReceive('normalizeBodyToHtml')->andReturn('<p>Hello</p>');
-        $composer->shouldReceive('renderWithEmailLayout')->andReturn('<html>Hello</html>');
-
-        $log = Mockery::mock(AttendanceNotificationLogService::class);
-        $log->shouldReceive('logNotification')->atLeast()->once();
-
-        $service = $this->makeService(
-            mailer: $mailer,
-            parents: $parents,
-            composer: $composer,
-            log: $log
+        $service = new AttendanceNotificationWorkflowService(
+            new \App\Models\Student(),
+            new \App\Models\StudentClass(),
+            new \App\Models\AttendanceData(),
+            new \App\Models\AttendanceTracking(),
+            new \App\Models\Configuration(),
+            Mockery::mock(\App\Services\AttendanceTracking\AttendanceMailerService::class),
+            Mockery::mock(\App\Services\AttendanceTracking\ViolationRuleEngineService::class),
+            Mockery::mock(\App\Services\AttendanceTracking\AttendanceParentLookupService::class),
+            Mockery::mock(\App\Services\AttendanceTracking\AttendanceEmailComposerService::class),
+            Mockery::mock(\App\Services\AttendanceTracking\AttendanceNotificationLogService::class)
         );
 
-        $result = $service->sendEmailManual([
-            'student_id' => 10,
-            'to' => 'parent@example.com',
-            'subject' => 'Test',
-            'body_html' => 'Hello',
-            'code' => 'ABS_1',
-            'incident_date' => '2026-03-01',
-        ], ['2026-03-01']);
+        $result = $service->record([
+            'student_id' => 1,
+            'date' => '2025-01-01',
+        ]);
 
         $this->assertFalse($result['success']);
-        $this->assertSame(500, $result['status']);
+        $this->assertSame(422, $result['status']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceParentLookupServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceParentLookupServiceTest.php
index 4254ba9e..30f585d1 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceParentLookupServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceParentLookupServiceTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Services\AttendanceParentLookupService;
+use App\Services\AttendanceTracking\AttendanceParentLookupService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
@@ -11,86 +11,78 @@ class AttendanceParentLookupServiceTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_get_primary_parent_for_student_returns_parent_info(): void
+    public function test_get_primary_parent_for_student(): void
     {
         DB::table('users')->insert([
-            'id' => 100,
-            'firstname' => 'Jane',
-            'lastname' => 'Doe',
-            'email' => 'jane@example.com',
-            'cellphone' => '555-1111',
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'One',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
         ]);
 
         DB::table('students')->insert([
-            'id' => 200,
-            'parent_id' => 100,
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
         ]);
 
         $service = new AttendanceParentLookupService();
+        $parent = $service->getPrimaryParentForStudent(1);
 
-        $result = $service->getPrimaryParentForStudent(200);
-
-        $this->assertNotNull($result);
-        $this->assertSame(100, $result['user_id']);
-        $this->assertSame('jane@example.com', $result['email']);
-        $this->assertSame('Jane Doe', $result['parent_name']);
+        $this->assertSame('parent@example.com', $parent['email']);
     }
 
-    public function test_get_secondary_parent_for_student_returns_secondary_user_when_present(): void
+    public function test_get_secondary_parent_falls_back_to_parent_row(): void
     {
-        DB::table('users')->insert([
-            ['id' => 100, 'firstname' => 'Jane', 'lastname' => 'Doe', 'email' => 'jane@example.com', 'cellphone' => '555-1111'],
-            ['id' => 101, 'firstname' => 'John', 'lastname' => 'Doe', 'email' => 'john@example.com', 'cellphone' => '555-2222'],
-        ]);
-
         DB::table('students')->insert([
-            'id' => 200,
-            'parent_id' => 100,
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 11,
+            'year_of_registration' => '2025',
             'school_year' => '2025-2026',
         ]);
 
         DB::table('parents')->insert([
-            'firstparent_id' => 100,
-            'secondparent_id' => 101,
+            'secondparent_firstname' => 'Second',
+            'secondparent_lastname' => 'Parent',
+            'secondparent_gender' => 'Female',
+            'secondparent_email' => 'second@example.com',
+            'secondparent_phone' => '5551112222',
+            'firstparent_id' => 11,
+            'secondparent_id' => 0,
+            'semester' => 'Fall',
             'school_year' => '2025-2026',
-            'updated_at' => now(),
         ]);
 
         $service = new AttendanceParentLookupService();
+        $parent = $service->getSecondaryParentForStudent(1, '2025-2026');
 
-        $result = $service->getSecondaryParentForStudent(200, '2025-2026');
-
-        $this->assertNotNull($result);
-        $this->assertSame(101, $result['user_id']);
-        $this->assertSame('john@example.com', $result['email']);
+        $this->assertSame('second@example.com', $parent['email']);
     }
-
-    public function test_parents_info_returns_primary_and_secondary_data(): void
-    {
-        DB::table('users')->insert([
-            ['id' => 100, 'firstname' => 'Jane', 'lastname' => 'Doe', 'email' => 'jane@example.com', 'cellphone' => '555-1111'],
-            ['id' => 101, 'firstname' => 'John', 'lastname' => 'Doe', 'email' => 'john@example.com', 'cellphone' => '555-2222'],
-        ]);
-
-        DB::table('students')->insert([
-            'id' => 200,
-            'parent_id' => 100,
-            'school_year' => '2025-2026',
-        ]);
-
-        DB::table('parents')->insert([
-            'firstparent_id' => 100,
-            'secondparent_id' => 101,
-            'school_year' => '2025-2026',
-            'updated_at' => now(),
-        ]);
-
-        $service = new AttendanceParentLookupService();
-
-        $result = $service->parentsInfo(200, '2025-2026');
-
-        $this->assertTrue($result['success']);
-        $this->assertSame('jane@example.com', $result['data']['primary']['email']);
-        $this->assertSame('john@example.com', $result['data']['secondary']['email']);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendancePendingViolationServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendancePendingViolationServiceTest.php
index aae260c1..48cab1a1 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendancePendingViolationServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendancePendingViolationServiceTest.php
@@ -2,49 +2,39 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Services\AttendancePendingViolationService;
-use App\Services\AttendanceViolationStudentResolverService;
-use App\Services\ViolationRuleEngineService;
+use App\Services\AttendanceTracking\AttendancePendingViolationService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Mockery;
 use Tests\TestCase;
 
 class AttendancePendingViolationServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_returns_error_when_no_students(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
+        $resolver = Mockery::mock(\App\Services\AttendanceTracking\AttendanceViolationStudentResolverService::class);
+        $resolver->shouldReceive('resolveForSchoolYear')->andReturn([
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'student_ids' => [],
+            'student_codes' => [],
+            'students' => [],
+            'student_code_to_id' => [],
+            'existing_ids' => [],
+            'debug' => [],
+        ]);
 
-    public function test_get_pending_violations_returns_error_when_no_student_identifiers_found(): void
-    {
-        $attendanceData = Mockery::mock(AttendanceData::class);
-        $rules = Mockery::mock(ViolationRuleEngineService::class);
-        $resolver = Mockery::mock(AttendanceViolationStudentResolverService::class);
+        $engine = Mockery::mock(\App\Services\AttendanceTracking\ViolationRuleEngineService::class);
 
-        $resolver->shouldReceive('resolveForSchoolYear')
-            ->once()
-            ->with('2025-2026', null)
-            ->andReturn([
-                'school_year' => '2025-2026',
-                'semester' => null,
-                'student_ids' => [],
-                'student_codes' => [],
-                'students' => [],
-                'student_code_to_id' => [],
-                'existing_ids' => [],
-                'debug' => [
-                    'class_students' => 0,
-                    'student_ids' => 0,
-                ],
-            ]);
+        $service = new AttendancePendingViolationService(
+            new \App\Models\AttendanceData(),
+            $engine,
+            $resolver
+        );
 
-        $service = new AttendancePendingViolationService($attendanceData, $rules, $resolver);
+        $result = $service->getPendingViolations('2025-2026', null, null);
 
-        $result = $service->getPendingViolations('2025-2026');
-
-        $this->assertSame([], $result['students']);
         $this->assertSame('No student identifiers found for the current school year.', $result['error']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceTrackingServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceTrackingServiceTest.php
index 8b9c7af8..6341d5ec 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceTrackingServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceTrackingServiceTest.php
@@ -2,134 +2,17 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Models\AttendanceTracking;
-use App\Models\Configuration;
-use App\Models\Student;
-use App\Models\StudentClass;
-use App\Services\AttendanceCaseQueryService;
-use App\Services\AttendanceCommunicationSupportService;
-use App\Services\AttendanceEmailComposerService;
-use App\Services\AttendanceMailerService;
-use App\Services\AttendanceNotificationLogService;
-use App\Services\AttendanceNotificationWorkflowService;
-use App\Services\AttendanceParentLookupService;
-use App\Services\AttendancePendingViolationService;
-use App\Services\AttendanceTrackingService;
-use App\Services\AttendanceViolationStudentResolverService;
-use App\Services\ViolationRuleEngineService;
-use Mockery;
+use App\Services\AttendanceTracking\AttendanceTrackingService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class AttendanceTrackingServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_service_instantiates(): void
     {
-        Mockery::close();
-        parent::tearDown();
+        $service = new AttendanceTrackingService();
+        $this->assertInstanceOf(AttendanceTrackingService::class, $service);
     }
-
-    protected function makeService(
-        ?AttendancePendingViolationService $pending = null,
-        ?AttendanceCaseQueryService $caseQuery = null,
-        ?AttendanceNotificationWorkflowService $workflow = null,
-        ?AttendanceCommunicationSupportService $support = null
-    ): AttendanceTrackingService {
-        $student = Mockery::mock(Student::class);
-        $studentClass = Mockery::mock(StudentClass::class);
-        $attendanceData = Mockery::mock(AttendanceData::class);
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $config = Mockery::mock(Configuration::class);
-        $mailer = Mockery::mock(AttendanceMailerService::class);
-        $rules = Mockery::mock(ViolationRuleEngineService::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-        $composer = Mockery::mock(AttendanceEmailComposerService::class);
-        $log = Mockery::mock(AttendanceNotificationLogService::class);
-        $resolver = Mockery::mock(AttendanceViolationStudentResolverService::class);
-
-        $pending ??= Mockery::mock(AttendancePendingViolationService::class);
-        $caseQuery ??= Mockery::mock(AttendanceCaseQueryService::class);
-        $workflow ??= Mockery::mock(AttendanceNotificationWorkflowService::class);
-        $support ??= Mockery::mock(AttendanceCommunicationSupportService::class);
-
-        $config->shouldReceive('getConfig')->with('semester')->andReturn('Fall');
-        $config->shouldReceive('getConfig')->with('school_year')->andReturn('2025-2026');
-
-        return new AttendanceTrackingService(
-            $student,
-            $studentClass,
-            $attendanceData,
-            $tracking,
-            $config,
-            $mailer,
-            $rules,
-            $parents,
-            $composer,
-            $log,
-            $resolver,
-            $caseQuery,
-            $workflow,
-            $support,
-            $pending
-        );
-    }
-
-    public function test_get_pending_violations_delegates_to_pending_service(): void
-    {
-        $pending = Mockery::mock(AttendancePendingViolationService::class);
-        $pending->shouldReceive('getPendingViolations')
-            ->once()
-            ->with('2025-2026', null, null)
-            ->andReturn(['students' => []]);
-
-        $service = $this->makeService(pending: $pending);
-
-        $result = $service->getPendingViolations();
-
-        $this->assertSame(['students' => []], $result);
-    }
-
-    public function test_get_student_case_delegates_to_case_query_service(): void
-    {
-        $caseQuery = Mockery::mock(AttendanceCaseQueryService::class);
-        $caseQuery->shouldReceive('getStudentCase')
-            ->once()
-            ->andReturn(['success' => true]);
-
-        $service = $this->makeService(caseQuery: $caseQuery);
-
-        $result = $service->getStudentCase(1);
-
-        $this->assertTrue($result['success']);
-    }
-
-    public function test_record_delegates_to_workflow_service(): void
-    {
-        $workflow = Mockery::mock(AttendanceNotificationWorkflowService::class);
-        $workflow->shouldReceive('record')
-            ->once()
-            ->with(['student_id' => 10])
-            ->andReturn(['success' => true]);
-
-        $service = $this->makeService(workflow: $workflow);
-
-        $result = $service->record(['student_id' => 10]);
-
-        $this->assertTrue($result['success']);
-    }
-
-    public function test_compose_delegates_to_support_service(): void
-    {
-        $support = Mockery::mock(AttendanceCommunicationSupportService::class);
-        $support->shouldReceive('compose')
-            ->once()
-            ->with(10, 'ABS_1', 'default', null)
-            ->andReturn(['success' => true]);
-
-        $service = $this->makeService(support: $support);
-
-        $result = $service->compose(10);
-
-        $this->assertTrue($result['success']);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/AttendanceViolationStudentResolverServiceTest.php b/tests/Unit/Services/AttendanceTracking/AttendanceViolationStudentResolverServiceTest.php
index ec709b9c..5a8bd45b 100644
--- a/tests/Unit/Services/AttendanceTracking/AttendanceViolationStudentResolverServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/AttendanceViolationStudentResolverServiceTest.php
@@ -2,67 +2,46 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceData;
-use App\Models\Student;
-use App\Models\StudentClass;
-use App\Services\AttendanceViolationStudentResolverService;
-use Mockery;
+use App\Services\AttendanceTracking\AttendanceViolationStudentResolverService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
 use Tests\TestCase;
 
 class AttendanceViolationStudentResolverServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_resolve_for_school_year_returns_students(): void
     {
-        Mockery::close();
-        parent::tearDown();
-    }
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+        ]);
 
-    public function test_ensure_attendance_student_exists_keeps_numeric_student(): void
-    {
-        $student = Mockery::mock(Student::class);
-        $studentClass = Mockery::mock(StudentClass::class);
-        $attendanceData = Mockery::mock(AttendanceData::class);
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 10,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
 
-        $service = new AttendanceViolationStudentResolverService($student, $studentClass, $attendanceData);
-
-        $students = [];
-        $studentCodeToId = [];
-        $existingIds = [];
-
-        $sid = $service->ensureAttendanceStudentExists(
-            $students,
-            $studentCodeToId,
-            $existingIds,
-            123
+        $service = new AttendanceViolationStudentResolverService(
+            new \App\Models\Student(),
+            new \App\Models\StudentClass(),
+            new \App\Models\AttendanceData()
         );
 
-        $this->assertSame(123, $sid);
-        $this->assertCount(1, $students);
-        $this->assertSame(123, $students[0]['id']);
+        $result = $service->resolveForSchoolYear('2025-2026', 'Fall');
+
+        $this->assertContains(1, $result['student_ids']);
+        $this->assertNotEmpty($result['students']);
     }
-
-    public function test_ensure_attendance_student_exists_creates_placeholder_for_code(): void
-    {
-        $student = Mockery::mock(Student::class);
-        $studentClass = Mockery::mock(StudentClass::class);
-        $attendanceData = Mockery::mock(AttendanceData::class);
-
-        $service = new AttendanceViolationStudentResolverService($student, $studentClass, $attendanceData);
-
-        $students = [];
-        $studentCodeToId = [];
-        $existingIds = [];
-
-        $sid = $service->ensureAttendanceStudentExists(
-            $students,
-            $studentCodeToId,
-            $existingIds,
-            'SCH-001'
-        );
-
-        $this->assertNotNull($sid);
-        $this->assertCount(1, $students);
-        $this->assertSame('SCH-001', $students[0]['school_id']);
-        $this->assertArrayHasKey('SCH-001', $studentCodeToId);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/AttendanceTracking/ViolationRuleEngineServiceTest.php b/tests/Unit/Services/AttendanceTracking/ViolationRuleEngineServiceTest.php
index 50250fa4..74387c4c 100644
--- a/tests/Unit/Services/AttendanceTracking/ViolationRuleEngineServiceTest.php
+++ b/tests/Unit/Services/AttendanceTracking/ViolationRuleEngineServiceTest.php
@@ -2,111 +2,37 @@
 
 namespace Tests\Unit\Services\AttendanceTracking;
 
-use App\Models\AttendanceTracking;
-use App\Services\AttendanceParentLookupService;
-use App\Services\ViolationRuleEngineService;
+use App\Services\AttendanceTracking\ViolationRuleEngineService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Mockery;
 use Tests\TestCase;
 
 class ViolationRuleEngineServiceTest extends TestCase
 {
-    protected function tearDown(): void
+    use RefreshDatabase;
+
+    public function test_school_year_helpers(): void
     {
-        Mockery::close();
-        parent::tearDown();
+        $service = $this->makeService();
+
+        $this->assertSame(['2025-08-01', '2026-07-31'], $service->deriveSchoolYearBounds('2025-2026'));
+        $this->assertSame('2025-2026', $service->schoolYearForDate('2025-09-01'));
     }
 
-    public function test_choose_higher_severity_returns_higher_severity_rule(): void
+    public function test_window_weeks_for_violation_code(): void
     {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
-        $service = new ViolationRuleEngineService($tracking, $parents);
-
-        $result = $service->chooseHigherSeverity(
-            ['severity' => 2, 'action' => 'team_notify'],
-            ['severity' => 4, 'action' => 'auto_email']
-        );
-
-        $this->assertSame(4, $result['severity']);
-    }
-
-    public function test_choose_higher_severity_breaks_ties_by_action_priority(): void
-    {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
-        $service = new ViolationRuleEngineService($tracking, $parents);
-
-        $result = $service->chooseHigherSeverity(
-            ['severity' => 3, 'action' => 'team_notify'],
-            ['severity' => 3, 'action' => 'auto_email']
-        );
-
-        $this->assertSame('team_notify', $result['action']);
-    }
-
-    public function test_window_weeks_for_violation_code_returns_expected_values(): void
-    {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
-        $service = new ViolationRuleEngineService($tracking, $parents);
+        $service = $this->makeService();
 
         $this->assertSame(3, $service->windowWeeksForViolationCode('ABS_2'));
-        $this->assertSame(4, $service->windowWeeksForViolationCode('ABS_3'));
+        $this->assertSame(4, $service->windowWeeksForViolationCode('MIX'));
         $this->assertSame(5, $service->windowWeeksForViolationCode('ABS_4'));
-        $this->assertSame(4, $service->windowWeeksForViolationCode('LATE_4'));
     }
 
-    public function test_has_n_consecutive_items_detects_weekly_sequence(): void
+    private function makeService(): ViolationRuleEngineService
     {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
+        $tracking = new \App\Models\AttendanceTracking();
+        $parentLookup = Mockery::mock(\App\Services\AttendanceTracking\AttendanceParentLookupService::class);
 
-        $service = new ViolationRuleEngineService($tracking, $parents);
-
-        $result = $service->hasNConsecutiveItems(
-            ['2026-03-15', '2026-03-08', '2026-03-01'],
-            3,
-            7
-        );
-
-        $this->assertTrue($result);
+        return new ViolationRuleEngineService($tracking, $parentLookup);
     }
-
-    public function test_has_n_in_w_active_weeks_detects_window_match(): void
-    {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
-        $service = new ViolationRuleEngineService($tracking, $parents);
-
-        $this->assertTrue($service->hasNInWActiveWeeks([0, 1], 2, 3));
-        $this->assertFalse($service->hasNInWActiveWeeks([0], 2, 3));
-    }
-
-    public function test_two_lates_one_abs_in_w_weeks_detects_mix_rule(): void
-    {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
-        $service = new ViolationRuleEngineService($tracking, $parents);
-
-        $this->assertTrue($service->twoLatesOneAbsInWWeeks([1, 2], [3], 4));
-        $this->assertFalse($service->twoLatesOneAbsInWWeeks([1], [3], 4));
-    }
-
-    public function test_derive_school_year_bounds_returns_expected_dates(): void
-    {
-        $tracking = Mockery::mock(AttendanceTracking::class);
-        $parents = Mockery::mock(AttendanceParentLookupService::class);
-
-        $service = new ViolationRuleEngineService($tracking, $parents);
-
-        [$start, $end] = $service->deriveSchoolYearBounds('2025-2026');
-
-        $this->assertSame('2025-08-01', $start);
-        $this->assertSame('2026-07-31', $end);
-    }
-}
\ No newline at end of file
+}
diff --git a/tests/Unit/Services/Auth/RegistrationCaptchaServiceTest.php b/tests/Unit/Services/Auth/RegistrationCaptchaServiceTest.php
new file mode 100644
index 00000000..7580bc4e
--- /dev/null
+++ b/tests/Unit/Services/Auth/RegistrationCaptchaServiceTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Tests\Unit\Services\Auth;
+
+use App\Services\Auth\RegistrationCaptchaService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class RegistrationCaptchaServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_generate_sets_session_value(): void
+    {
+        $service = new RegistrationCaptchaService();
+        $value = $service->generate(6);
+
+        $this->assertNotEmpty($value);
+        $this->assertSame($value, session()->get('captcha_answer'));
+    }
+
+    public function test_verify_and_clear(): void
+    {
+        $service = new RegistrationCaptchaService();
+        session()->put('captcha_answer', 'ABC123');
+
+        $this->assertTrue($service->verify('ABC123'));
+        $this->assertFalse($service->verify('WRONG'));
+
+        $service->clear();
+        $this->assertNull(session()->get('captcha_answer'));
+    }
+}
diff --git a/tests/Unit/Services/Auth/RegistrationFormatterServiceTest.php b/tests/Unit/Services/Auth/RegistrationFormatterServiceTest.php
new file mode 100644
index 00000000..b26561c8
--- /dev/null
+++ b/tests/Unit/Services/Auth/RegistrationFormatterServiceTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Unit\Services\Auth;
+
+use App\Services\Auth\RegistrationFormatterService;
+use App\Services\PhoneFormatterService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class RegistrationFormatterServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_format_normalizes_parent_fields(): void
+    {
+        $formatter = new RegistrationFormatterService(new PhoneFormatterService());
+
+        $result = $formatter->format([
+            'firstname' => 'john',
+            'lastname' => 'doe',
+            'email' => 'USER@EXAMPLE.COM',
+            'gender' => 'Male',
+            'city' => 'new haven',
+            'cellphone' => '(203) 555-1234',
+            'address_street' => '123 main st',
+            'apt' => 'a1',
+            'state' => 'ct',
+            'zip' => '06510',
+            'accept_school_policy' => 1,
+            'no_second_parent_info' => 1,
+        ]);
+
+        $this->assertSame('John', $result['firstname']);
+        $this->assertSame('Doe', $result['lastname']);
+        $this->assertSame('user@example.com', $result['email']);
+        $this->assertSame('New Haven', $result['city']);
+        $this->assertSame('203-555-1234', $result['cellphone']);
+        $this->assertSame('CT', $result['state']);
+        $this->assertArrayNotHasKey('second_firstname', $result);
+    }
+
+    public function test_format_includes_second_parent_when_present(): void
+    {
+        $formatter = new RegistrationFormatterService(new PhoneFormatterService());
+
+        $result = $formatter->format([
+            'firstname' => 'john',
+            'lastname' => 'doe',
+            'email' => 'user@example.com',
+            'gender' => 'Male',
+            'city' => 'new haven',
+            'cellphone' => '2035551234',
+            'address_street' => '123 main st',
+            'apt' => 'a1',
+            'state' => 'ct',
+            'zip' => '06510',
+            'accept_school_policy' => 1,
+            'second_firstname' => 'jane',
+            'second_lastname' => 'doe',
+            'second_gender' => 'Female',
+            'second_email' => 'jane@example.com',
+            'second_cellphone' => '2035559876',
+        ]);
+
+        $this->assertSame('Jane', $result['second_firstname']);
+        $this->assertSame('Doe', $result['second_lastname']);
+        $this->assertSame('jane@example.com', $result['second_email']);
+        $this->assertSame('203-555-9876', $result['second_cellphone']);
+    }
+}
diff --git a/tests/Unit/Services/Auth/RegistrationServiceTest.php b/tests/Unit/Services/Auth/RegistrationServiceTest.php
new file mode 100644
index 00000000..798ac59e
--- /dev/null
+++ b/tests/Unit/Services/Auth/RegistrationServiceTest.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace Tests\Unit\Services\Auth;
+
+use App\Models\Role;
+use App\Models\User;
+use App\Services\Auth\RegistrationCaptchaService;
+use App\Services\Auth\RegistrationFormatterService;
+use App\Services\Auth\RegistrationService;
+use App\Services\EmailService;
+use App\Services\PhoneFormatterService;
+use App\Services\SchoolIdService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Mockery;
+use Tests\TestCase;
+
+class RegistrationServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_register_creates_parent_user(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 2001, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2002, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        Role::query()->create([
+            'id' => 1,
+            'name' => 'parent',
+            'slug' => 'parent',
+            'description' => 'Parent',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        session()->put('captcha_answer', 'ABCD');
+
+        $emailService = Mockery::mock(EmailService::class);
+        $emailService->shouldReceive('send')->once()->andReturn(true);
+
+        $service = new RegistrationService(
+            $emailService,
+            new SchoolIdService(),
+            new RegistrationFormatterService(new PhoneFormatterService()),
+            new RegistrationCaptchaService()
+        );
+
+        $result = $service->register([
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'gender' => 'Male',
+            'email' => 'parent@example.com',
+            'confirm_email' => 'parent@example.com',
+            'cellphone' => '5555555555',
+            'address_street' => '123 Main',
+            'apt' => 'A',
+            'city' => 'City',
+            'state' => 'CT',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'captcha' => 'ABCD',
+            'is_parent' => 1,
+            'no_second_parent_info' => 1,
+        ]);
+
+        $this->assertTrue($result['ok']);
+        $this->assertDatabaseHas('users', [
+            'email' => 'parent@example.com',
+            'status' => 'Inactive',
+        ]);
+        $this->assertDatabaseHas('user_roles', [
+            'user_id' => $result['user']->id,
+            'role_id' => 1,
+        ]);
+    }
+
+    public function test_register_rejects_pending_activation(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 2001, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2002, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        Role::query()->create([
+            'id' => 1,
+            'name' => 'parent',
+            'slug' => 'parent',
+            'description' => 'Parent',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        User::query()->create([
+            'school_id' => '2500001',
+            'firstname' => 'Existing',
+            'lastname' => 'User',
+            'gender' => 'Male',
+            'cellphone' => '555-555-5555',
+            'email' => 'existing@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'CT',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 0,
+            'status' => 'Inactive',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => pbkdf2_hash('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'token' => 'token',
+        ]);
+
+        session()->put('captcha_answer', 'ABCD');
+
+        $emailService = Mockery::mock(EmailService::class);
+        $emailService->shouldNotReceive('send');
+
+        $service = new RegistrationService(
+            $emailService,
+            new SchoolIdService(),
+            new RegistrationFormatterService(new PhoneFormatterService()),
+            new RegistrationCaptchaService()
+        );
+
+        $result = $service->register([
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'gender' => 'Male',
+            'email' => 'existing@example.com',
+            'confirm_email' => 'existing@example.com',
+            'cellphone' => '5555555555',
+            'address_street' => '123 Main',
+            'apt' => 'A',
+            'city' => 'City',
+            'state' => 'CT',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'captcha' => 'ABCD',
+            'is_parent' => 1,
+            'no_second_parent_info' => 1,
+        ]);
+
+        $this->assertFalse($result['ok']);
+        $this->assertSame('pending_activation', $result['code']);
+    }
+}
diff --git a/tests/Unit/Services/BroadcastEmail/BroadcastEmailComposerServiceTest.php b/tests/Unit/Services/BroadcastEmail/BroadcastEmailComposerServiceTest.php
new file mode 100644
index 00000000..6566ef87
--- /dev/null
+++ b/tests/Unit/Services/BroadcastEmail/BroadcastEmailComposerServiceTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Unit\Services\BroadcastEmail;
+
+use App\Services\BroadcastEmail\BroadcastEmailComposerService;
+use Tests\TestCase;
+
+class BroadcastEmailComposerServiceTest extends TestCase
+{
+    public function test_sanitize_removes_script_and_events(): void
+    {
+        $service = new BroadcastEmailComposerService();
+        $html = '<p onclick="alert(1)">Hi</p><script>alert(2)</script>';
+
+        $clean = $service->sanitizeHtml($html);
+
+        $this->assertStringNotContainsString('script', $clean);
+        $this->assertStringNotContainsString('onclick', $clean);
+    }
+
+    public function test_compose_replaces_name_when_personalized(): void
+    {
+        $service = new BroadcastEmailComposerService();
+        $html = '<p>Hello {{name}}</p>';
+
+        $rendered = $service->compose(false, 'Subject', $html, 'Parent', '', '', '', true);
+
+        $this->assertSame('<p>Hello Parent</p>', $rendered);
+    }
+}
diff --git a/tests/Unit/Services/BroadcastEmail/BroadcastEmailRecipientServiceTest.php b/tests/Unit/Services/BroadcastEmail/BroadcastEmailRecipientServiceTest.php
new file mode 100644
index 00000000..2465c4db
--- /dev/null
+++ b/tests/Unit/Services/BroadcastEmail/BroadcastEmailRecipientServiceTest.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Tests\Unit\Services\BroadcastEmail;
+
+use App\Services\BroadcastEmail\BroadcastEmailRecipientService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class BroadcastEmailRecipientServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_parents_with_emails_filters_missing_email(): void
+    {
+        $this->seedParentData();
+
+        $service = new BroadcastEmailRecipientService();
+        $parents = $service->parentsWithEmails();
+
+        $this->assertCount(1, $parents);
+        $this->assertSame('parent@example.com', $parents[0]['email']);
+    }
+
+    public function test_recipients_by_ids_returns_names(): void
+    {
+        $this->seedParentData();
+
+        $service = new BroadcastEmailRecipientService();
+        $recipients = $service->recipientsByIds([10]);
+
+        $this->assertCount(1, $recipients);
+        $this->assertSame('Parent User', $recipients[0]['name']);
+    }
+
+    private function seedParentData(): void
+    {
+        DB::table('roles')->insert([
+            'id' => 1,
+            'name' => 'parent',
+            'slug' => 'parent',
+            'is_active' => 1,
+        ]);
+
+        DB::table('users')->insert([
+            [
+                'id' => 10,
+                'school_id' => 1,
+                'firstname' => 'Parent',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'parent@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 11,
+                'school_id' => 1,
+                'firstname' => 'No',
+                'lastname' => 'Email',
+                'cellphone' => '5555555555',
+                'email' => '',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 10, 'role_id' => 1],
+            ['user_id' => 11, 'role_id' => 1],
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/BroadcastEmail/BroadcastEmailSenderOptionsServiceTest.php b/tests/Unit/Services/BroadcastEmail/BroadcastEmailSenderOptionsServiceTest.php
new file mode 100644
index 00000000..7627c1ea
--- /dev/null
+++ b/tests/Unit/Services/BroadcastEmail/BroadcastEmailSenderOptionsServiceTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Unit\Services\BroadcastEmail;
+
+use App\Services\BroadcastEmail\BroadcastEmailSenderOptionsService;
+use Tests\TestCase;
+
+class BroadcastEmailSenderOptionsServiceTest extends TestCase
+{
+    public function test_list_options_from_env(): void
+    {
+        $old = getenv('MAIL_SENDERS') ?: '';
+        putenv('MAIL_SENDERS={"general":{"name":"Office","email":"office@example.com"}}');
+
+        $service = new BroadcastEmailSenderOptionsService();
+        $options = $service->listOptions();
+
+        $this->assertSame('general', $options[0]['key']);
+        $this->assertSame('Office <office@example.com>', $options[0]['label']);
+
+        putenv('MAIL_SENDERS=' . $old);
+    }
+}
diff --git a/tests/Unit/Services/ClassPrep/ClassRosterServiceTest.php b/tests/Unit/Services/ClassPrep/ClassRosterServiceTest.php
new file mode 100644
index 00000000..fea21717
--- /dev/null
+++ b/tests/Unit/Services/ClassPrep/ClassRosterServiceTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPrep;
+
+use App\Services\ClassPrep\ClassRosterService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassRosterServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_students_by_class(): void
+    {
+        $this->seedRosterData();
+
+        $service = new ClassRosterService();
+        $students = $service->listStudentsByClass(101, '2025-2026');
+
+        $this->assertCount(1, $students);
+        $this->assertSame('1-A', $students[0]['registration_grade']);
+    }
+
+    private function seedRosterData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+        ]);
+
+        DB::table('classes')->insert([
+            'id' => 1,
+            'class_name' => 'Class 1',
+            'schedule' => 'Sun',
+            'capacity' => 20,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 101,
+            'class_section_name' => '1-A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'school_id' => 'S-1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_active' => 1,
+            'is_new' => 0,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/ClassPrep/StickerCountServiceTest.php b/tests/Unit/Services/ClassPrep/StickerCountServiceTest.php
new file mode 100644
index 00000000..e68a646a
--- /dev/null
+++ b/tests/Unit/Services/ClassPrep/StickerCountServiceTest.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPrep;
+
+use App\Services\ClassPrep\StickerCountService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class StickerCountServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_all_returns_totals_excluding_youth(): void
+    {
+        $this->seedStickerData();
+
+        $service = new StickerCountService();
+        $payload = $service->listAll('2025-2026', 'Fall');
+
+        $this->assertSame(2, $payload['totals']['students']);
+        $this->assertSame(6, $payload['totals']['primary']);
+        $this->assertSame(1, $payload['totals']['secondary']);
+    }
+
+    public function test_list_for_class_limits_results(): void
+    {
+        $this->seedStickerData();
+
+        $service = new StickerCountService();
+        $payload = $service->listForClass('2025-2026', 'Fall', 101);
+
+        $this->assertSame(1, $payload['totals']['students']);
+        $this->assertSame(3, $payload['totals']['primary']);
+        $this->assertSame(0, $payload['totals']['secondary']);
+    }
+
+    private function seedStickerData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('classes')->insert([
+            [
+                'id' => 1,
+                'class_name' => 'Class 1',
+                'schedule' => 'Sun',
+                'capacity' => 20,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'class_name' => 'Class 2',
+                'schedule' => 'Sun',
+                'capacity' => 20,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 3,
+                'class_name' => 'Class 3',
+                'schedule' => 'Sun',
+                'capacity' => 20,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('classSection')->insert([
+            [
+                'id' => 1,
+                'class_id' => 1,
+                'class_section_id' => 101,
+                'class_section_name' => '1-A',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'class_id' => 2,
+                'class_section_id' => 102,
+                'class_section_name' => '5-B',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 3,
+                'class_id' => 3,
+                'class_section_id' => 103,
+                'class_section_name' => 'Youth-1',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('students')->insert([
+            [
+                'school_id' => 'S-1',
+                'firstname' => 'Student',
+                'lastname' => 'One',
+                'age' => 8,
+                'gender' => 'Male',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+                'is_new' => 0,
+            ],
+            [
+                'school_id' => 'S-2',
+                'firstname' => 'Student',
+                'lastname' => 'Two',
+                'age' => 10,
+                'gender' => 'Female',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+                'is_new' => 0,
+            ],
+            [
+                'school_id' => 'S-3',
+                'firstname' => 'Student',
+                'lastname' => 'Three',
+                'age' => 12,
+                'gender' => 'Female',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+                'is_new' => 1,
+            ],
+        ]);
+
+        DB::table('student_class')->insert([
+            [
+                'student_id' => 1,
+                'class_section_id' => 101,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 2,
+                'class_section_id' => 102,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 3,
+                'class_section_id' => 103,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationAdjustmentServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationAdjustmentServiceTest.php
new file mode 100644
index 00000000..8cc02f54
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationAdjustmentServiceTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationAdjustmentService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationAdjustmentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_apply_adjustments_updates_counts(): void
+    {
+        DB::table('class_prep_adjustments')->insert([
+            'class_section_id' => 101,
+            'item_name' => 'Small Table',
+            'adjustment' => 2,
+            'school_year' => '2025-2026',
+            'adjustable' => 1,
+        ]);
+
+        $service = new ClassPreparationAdjustmentService();
+        [$items, $adjMap] = $service->applyAdjustments(['Small Table' => 1], '101', '2025-2026');
+
+        $this->assertSame(3, $items['Small Table']);
+        $this->assertSame(2, $adjMap['Small Table']);
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationCalculatorServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationCalculatorServiceTest.php
new file mode 100644
index 00000000..c3096037
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationCalculatorServiceTest.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationCalculatorService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationCalculatorServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_class_level_by_section(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 101,
+            'class_section_name' => '2-A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ClassPreparationCalculatorService();
+
+        $this->assertSame(2, $service->getClassLevelBySection('101'));
+        $this->assertSame(1, $service->getClassLevelBySection('KG'));
+    }
+
+    public function test_calculate_prep_items_for_lower_grades(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+        ]);
+
+        DB::table('inventory_categories')->insert([
+            ['name' => 'Small Table', 'grade_min' => null, 'grade_max' => null, 'type' => 'classroom'],
+            ['name' => 'Small Chair', 'grade_min' => null, 'grade_max' => null, 'type' => 'classroom'],
+            ['name' => 'Teacher Chair', 'grade_min' => null, 'grade_max' => null, 'type' => 'classroom'],
+            ['name' => 'Grade Box', 'grade_min' => null, 'grade_max' => null, 'type' => 'classroom'],
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'class_section_id' => 101,
+            'teacher_id' => 1,
+            'position' => 'main',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ClassPreparationCalculatorService();
+        $items = $service->calculatePrepItems(6, 1, '101');
+
+        $this->assertSame(2, $items['Small Table']);
+        $this->assertSame(6, $items['Small Chair']);
+        $this->assertSame(1, $items['Teacher Chair']);
+        $this->assertSame(1, $items['Grade Box']);
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationContextServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationContextServiceTest.php
new file mode 100644
index 00000000..6da0be6f
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationContextServiceTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationContextService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationContextServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_has_roster_for_semester(): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ClassPreparationContextService();
+
+        $this->assertTrue($service->hasRosterForSemester('2025-2026', 'Fall'));
+        $this->assertFalse($service->hasRosterForSemester('2025-2026', 'Spring'));
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationInventoryServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationInventoryServiceTest.php
new file mode 100644
index 00000000..c6b9af3b
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationInventoryServiceTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationInventoryService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationInventoryServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_build_availability_uses_max_value(): void
+    {
+        DB::table('inventory_categories')->insert([
+            'id' => 1,
+            'type' => 'classroom',
+            'name' => 'Small Table',
+        ]);
+
+        DB::table('inventory_items')->insert([
+            [
+                'type' => 'classroom',
+                'category_id' => 1,
+                'name' => 'Small Table',
+                'quantity' => 5,
+                'good_qty' => 5,
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+            ],
+            [
+                'type' => 'classroom',
+                'category_id' => 1,
+                'name' => 'Small Table',
+                'quantity' => 3,
+                'good_qty' => 3,
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+            ],
+        ]);
+
+        $service = new ClassPreparationInventoryService();
+        $map = $service->buildAvailability('2025-2026', 'Fall', true, ['Small Table']);
+
+        $this->assertSame(8, $map['Small Table']);
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationLogServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationLogServiceTest.php
new file mode 100644
index 00000000..158868d5
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationLogServiceTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationLogService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationLogServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_has_prep_changed_detects_diff(): void
+    {
+        $service = new ClassPreparationLogService();
+
+        $this->assertTrue($service->hasPrepChanged(['a' => 1], ['a' => 2]));
+        $this->assertFalse($service->hasPrepChanged(['a' => 1], ['a' => 1]));
+    }
+
+    public function test_create_log_and_get_latest(): void
+    {
+        $service = new ClassPreparationLogService();
+        $created = $service->createLog('101', '1-A', '2025-2026', ['Small Table' => 2], '2025-09-01 00:00:00');
+
+        $this->assertTrue($created);
+        $this->assertDatabaseHas('class_preparation_log', [
+            'class_section_id' => 101,
+            'school_year' => '2025-2026',
+        ]);
+
+        $log = $service->getLatestLog('101', '2025-2026');
+        $this->assertNotNull($log);
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationRosterServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationRosterServiceTest.php
new file mode 100644
index 00000000..c3c1db0a
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationRosterServiceTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationRosterService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationRosterServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_class_section_student_counts(): void
+    {
+        $this->seedRoster();
+
+        $service = new ClassPreparationRosterService();
+        $rows = $service->getClassSectionStudentCounts('2025-2026', 'Fall', true);
+
+        $this->assertCount(1, $rows);
+        $this->assertSame(101, (int) $rows[0]->class_section_id);
+        $this->assertSame(2, (int) $rows[0]->student_count);
+    }
+
+    public function test_get_student_count_for_section(): void
+    {
+        $this->seedRoster();
+
+        $service = new ClassPreparationRosterService();
+        $count = $service->getStudentCountForSection('2025-2026', 'Fall', true, '101');
+
+        $this->assertSame(2, $count);
+    }
+
+    private function seedRoster(): void
+    {
+        DB::table('students')->insert([
+            [
+                'id' => 1,
+                'school_id' => 'S-1',
+                'firstname' => 'Student',
+                'lastname' => 'One',
+                'age' => 8,
+                'gender' => 'Male',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+            ],
+            [
+                'id' => 2,
+                'school_id' => 'S-2',
+                'firstname' => 'Student',
+                'lastname' => 'Two',
+                'age' => 9,
+                'gender' => 'Female',
+                'photo_consent' => 1,
+                'parent_id' => 1,
+                'year_of_registration' => '2025',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'is_active' => 1,
+            ],
+        ]);
+
+        DB::table('student_class')->insert([
+            [
+                'student_id' => 1,
+                'class_section_id' => 101,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 2,
+                'class_section_id' => 101,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/ClassPreparation/ClassPreparationServiceTest.php b/tests/Unit/Services/ClassPreparation/ClassPreparationServiceTest.php
new file mode 100644
index 00000000..853f8209
--- /dev/null
+++ b/tests/Unit/Services/ClassPreparation/ClassPreparationServiceTest.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Tests\Unit\Services\ClassPreparation;
+
+use App\Services\ClassPreparation\ClassPreparationService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ClassPreparationServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_prep_returns_sections_and_totals(): void
+    {
+        $this->seedPrepData();
+
+        $service = new ClassPreparationService();
+        $payload = $service->listPrep('2025-2026', 'Fall');
+
+        $this->assertSame('2025-2026', $payload['schoolYear']);
+        $this->assertSame('Fall', $payload['semester']);
+        $this->assertNotEmpty($payload['results']);
+        $this->assertArrayHasKey('Small Table', $payload['totals']);
+    }
+
+    public function test_mark_printed_creates_logs(): void
+    {
+        $this->seedPrepData();
+
+        $service = new ClassPreparationService();
+        $count = $service->markPrinted('2025-2026', 'Fall', [101]);
+
+        $this->assertSame(1, $count);
+        $this->assertDatabaseHas('class_preparation_log', [
+            'class_section_id' => 101,
+            'school_year' => '2025-2026',
+        ]);
+    }
+
+    private function seedPrepData(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 101,
+            'class_section_name' => '1-A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'school_id' => 'S-1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('inventory_categories')->insert([
+            'type' => 'classroom',
+            'name' => 'Small Table',
+        ]);
+
+        DB::table('inventory_items')->insert([
+            'type' => 'classroom',
+            'category_id' => 1,
+            'name' => 'Small Table',
+            'quantity' => 10,
+            'good_qty' => 10,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Communication/CommunicationTemplateServiceTest.php b/tests/Unit/Services/Communication/CommunicationTemplateServiceTest.php
new file mode 100644
index 00000000..4c1fab86
--- /dev/null
+++ b/tests/Unit/Services/Communication/CommunicationTemplateServiceTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\Services\Communication;
+
+use App\Services\Communication\CommunicationTemplateService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class CommunicationTemplateServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_active_templates_maps_columns(): void
+    {
+        DB::table('email_templates')->insert([
+            'id' => 1,
+            'code' => 'welcome',
+            'variant' => 'default',
+            'subject' => 'Hello',
+            'body_html' => 'Body',
+            'is_active' => 1,
+        ]);
+
+        $service = new CommunicationTemplateService();
+        $templates = $service->listActiveTemplates();
+
+        $this->assertSame('welcome', $templates[0]['template_key']);
+        $this->assertSame('Body', $templates[0]['body']);
+    }
+}
diff --git a/tests/Unit/Services/CompetitionScores/CompetitionScoresSaveServiceTest.php b/tests/Unit/Services/CompetitionScores/CompetitionScoresSaveServiceTest.php
new file mode 100644
index 00000000..cf550815
--- /dev/null
+++ b/tests/Unit/Services/CompetitionScores/CompetitionScoresSaveServiceTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Unit\Services\CompetitionScores;
+
+use App\Models\CompetitionScore;
+use App\Services\CompetitionScores\CompetitionScoresSaveService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class CompetitionScoresSaveServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_filter_scores_rejects_non_integers(): void
+    {
+        $service = new CompetitionScoresSaveService();
+        [$clean, $invalid] = $service->filterScores([
+            1 => '10',
+            2 => '4.5',
+        ]);
+
+        $this->assertSame([1 => 10], $clean);
+        $this->assertSame([2], $invalid);
+    }
+
+    public function test_save_scores_upserts(): void
+    {
+        DB::table('competition_scores')->insert([
+            'competition_id' => 1,
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'score' => 2,
+        ]);
+
+        $service = new CompetitionScoresSaveService();
+        $service->saveScores(1, 101, [1 => 7]);
+
+        $this->assertDatabaseHas('competition_scores', [
+            'competition_id' => 1,
+            'student_id' => 1,
+            'class_section_id' => 101,
+            'score' => 7,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Discounts/DiscountApplyServiceTest.php b/tests/Unit/Services/Discounts/DiscountApplyServiceTest.php
new file mode 100644
index 00000000..22db9a0c
--- /dev/null
+++ b/tests/Unit/Services/Discounts/DiscountApplyServiceTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Unit\Services\Discounts;
+
+use App\Services\Discounts\DiscountApplyService;
+use App\Services\Discounts\DiscountContextService;
+use App\Services\Discounts\DiscountInvoiceService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class DiscountApplyServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_apply_voucher_returns_error_when_no_remaining_uses(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('discount_vouchers')->insert([
+            'id' => 1,
+            'code' => 'USED-OUT',
+            'discount_type' => 'fixed',
+            'discount_value' => 10,
+            'max_uses' => 1,
+            'times_used' => 1,
+            'is_active' => 1,
+        ]);
+
+        $service = new DiscountApplyService(new DiscountContextService(), new DiscountInvoiceService());
+        $result = $service->applyVoucher(1, [10], true, 1);
+
+        $this->assertFalse($result['ok']);
+    }
+}
diff --git a/tests/Unit/Services/Expenses/ExpenseReceiptServiceTest.php b/tests/Unit/Services/Expenses/ExpenseReceiptServiceTest.php
new file mode 100644
index 00000000..7a374401
--- /dev/null
+++ b/tests/Unit/Services/Expenses/ExpenseReceiptServiceTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Unit\Services\Expenses;
+
+use App\Services\Expenses\ExpenseReceiptService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Storage;
+use Tests\TestCase;
+
+class ExpenseReceiptServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_store_receipt_returns_filename_and_url(): void
+    {
+        Storage::fake();
+
+        $service = new ExpenseReceiptService();
+        $file = UploadedFile::fake()->create('receipt.pdf', 10, 'application/pdf');
+        $filename = $service->storeReceipt($file);
+
+        $this->assertNotEmpty($filename);
+        $this->assertSame(url('receipts/' . $filename), $service->receiptUrl($filename));
+    }
+}
diff --git a/tests/Unit/Services/Expenses/ExpenseStaffServiceTest.php b/tests/Unit/Services/Expenses/ExpenseStaffServiceTest.php
new file mode 100644
index 00000000..32874564
--- /dev/null
+++ b/tests/Unit/Services/Expenses/ExpenseStaffServiceTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Tests\Unit\Services\Expenses;
+
+use App\Services\Expenses\ExpenseStaffService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ExpenseStaffServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_staff_users_excludes_parents(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'administrator', 'slug' => 'administrator', 'is_active' => 1],
+            ['id' => 2, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            [
+                'id' => 10,
+                'school_id' => 1,
+                'firstname' => 'Staff',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'staff@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 11,
+                'school_id' => 1,
+                'firstname' => 'Parent',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'parent@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 10, 'role_id' => 1],
+            ['user_id' => 11, 'role_id' => 2],
+        ]);
+
+        $service = new ExpenseStaffService();
+        $staff = $service->listStaffUsers();
+
+        $this->assertCount(1, $staff);
+        $this->assertSame(10, $staff[0]['id']);
+    }
+}
diff --git a/tests/Unit/Services/ExtraCharges/ExtraChargesMetaServiceTest.php b/tests/Unit/Services/ExtraCharges/ExtraChargesMetaServiceTest.php
new file mode 100644
index 00000000..e4b41d7d
--- /dev/null
+++ b/tests/Unit/Services/ExtraCharges/ExtraChargesMetaServiceTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Unit\Services\ExtraCharges;
+
+use App\Services\ExtraCharges\ExtraChargesMetaService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ExtraChargesMetaServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_school_years_uses_fallback(): void
+    {
+        $service = new ExtraChargesMetaService();
+        $years = $service->getSchoolYears('2025-2026');
+
+        $this->assertSame(['2025-2026', '2024-2025', '2023-2024', '2022-2023'], $years);
+    }
+
+    public function test_get_school_years_merges_sources(): void
+    {
+        DB::table('additional_charges')->insert([
+            [
+                'parent_id' => 1,
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'charge_type' => 'add',
+                'title' => 'Test',
+                'amount' => 1,
+            ],
+            [
+                'parent_id' => 1,
+                'school_year' => '2024-2025',
+                'semester' => 'Fall',
+                'charge_type' => 'add',
+                'title' => 'Test',
+                'amount' => 1,
+            ],
+        ]);
+
+        DB::table('invoices')->insert([
+            [
+                'parent_id' => 1,
+                'invoice_number' => 'INV-1',
+                'total_amount' => 10,
+                'balance' => 10,
+                'paid_amount' => 0,
+                'issue_date' => '2025-09-01',
+                'status' => 'Unpaid',
+                'school_year' => '2023-2024',
+            ],
+        ]);
+
+        $service = new ExtraChargesMetaService();
+        $years = $service->getSchoolYears();
+
+        $this->assertSame(['2025-2026', '2024-2025', '2023-2024'], $years);
+    }
+}
diff --git a/tests/Unit/Services/Files/ExamDraftDownloadNameServiceTest.php b/tests/Unit/Services/Files/ExamDraftDownloadNameServiceTest.php
new file mode 100644
index 00000000..3ced4307
--- /dev/null
+++ b/tests/Unit/Services/Files/ExamDraftDownloadNameServiceTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Unit\Services\Files;
+
+use App\Services\Files\ExamDraftDownloadNameService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ExamDraftDownloadNameServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_build_returns_slugified_name(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '2B',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('exam_drafts')->insert([
+            'id' => 1,
+            'teacher_id' => 1,
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'exam_type' => 'Final Exam',
+            'draft_title' => 'Draft',
+            'teacher_file' => 'draft2.pdf',
+            'version' => 3,
+            'status' => 'draft',
+        ]);
+
+        $service = new ExamDraftDownloadNameService();
+        $name = $service->build('draft2.pdf', 'drafts');
+
+        $this->assertSame('2b_final_exam_v3', $name);
+    }
+}
diff --git a/tests/Unit/Services/Files/FileServeServiceTest.php b/tests/Unit/Services/Files/FileServeServiceTest.php
new file mode 100644
index 00000000..b28f1297
--- /dev/null
+++ b/tests/Unit/Services/Files/FileServeServiceTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Tests\Unit\Services\Files;
+
+use App\Services\Files\FileServeService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Tests\TestCase;
+
+class FileServeServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_meta_returns_file_metadata(): void
+    {
+        $dir = storage_path('testing/files');
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        $path = $dir . DIRECTORY_SEPARATOR . 'sample.pdf';
+        file_put_contents($path, 'PDFDATA');
+
+        $service = new FileServeService();
+        $meta = $service->meta($dir, 'sample.pdf', ['pdf'], 'download');
+
+        $this->assertSame('sample.pdf', $meta['name']);
+        $this->assertSame('download.pdf', $meta['download_name']);
+        $this->assertSame(7, $meta['size']);
+        $this->assertNotEmpty($meta['etag']);
+    }
+
+    public function test_serve_inline_returns_304_when_etag_matches(): void
+    {
+        $dir = storage_path('testing/files');
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        $path = $dir . DIRECTORY_SEPARATOR . 'cached.pdf';
+        file_put_contents($path, 'PDFDATA');
+
+        $service = new FileServeService();
+        $meta = $service->meta($dir, 'cached.pdf', ['pdf']);
+
+        $request = Request::create('/files/cached.pdf', 'GET', [], [], [], [
+            'HTTP_IF_NONE_MATCH' => $meta['etag'],
+        ]);
+
+        $response = $service->serveInline($dir, 'cached.pdf', ['pdf'], $request);
+
+        $this->assertSame(304, $response->getStatusCode());
+        $this->assertSame($meta['etag'], $response->headers->get('ETag'));
+    }
+
+    public function test_serve_inline_rejects_invalid_extension(): void
+    {
+        $this->expectException(HttpException::class);
+
+        $dir = storage_path('testing/files');
+        if (!is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        $path = $dir . DIRECTORY_SEPARATOR . 'sample.exe';
+        file_put_contents($path, 'DATA');
+
+        $service = new FileServeService();
+        $service->meta($dir, 'sample.exe', ['pdf']);
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialChartServiceTest.php b/tests/Unit/Services/Finance/FinancialChartServiceTest.php
new file mode 100644
index 00000000..e6b863ba
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialChartServiceTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialChartService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class FinancialChartServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_generate_charts_returns_null_in_tests(): void
+    {
+        $service = new FinancialChartService();
+
+        $summary = [
+            'totalCharges' => 100,
+            'amountCollected' => 80,
+            'totalUnpaid' => 20,
+            'totalDiscounts' => 5,
+            'totalRefunds' => 2,
+            'totalExpenses' => 10,
+            'totalReimbursements' => 4,
+            'netAmount' => 93,
+        ];
+
+        $this->assertNull($service->generateBarChart($summary));
+        $this->assertNull($service->generatePieChart($summary));
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialPaymentServiceTest.php b/tests/Unit/Services/Finance/FinancialPaymentServiceTest.php
new file mode 100644
index 00000000..491c43b2
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialPaymentServiceTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialPaymentService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class FinancialPaymentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_payment_aggregates_exclude_void_statuses(): void
+    {
+        DB::table('payments')->insert([
+            [
+                'id' => 1,
+                'parent_id' => 10,
+                'invoice_id' => 1,
+                'total_amount' => 100,
+                'paid_amount' => 30,
+                'balance' => 70,
+                'number_of_installments' => 1,
+                'payment_method' => 'Cash',
+                'payment_date' => '2025-01-05',
+                'school_year' => '2025-2026',
+                'status' => 'Paid',
+            ],
+            [
+                'id' => 2,
+                'parent_id' => 10,
+                'invoice_id' => 1,
+                'total_amount' => 100,
+                'paid_amount' => 20,
+                'balance' => 50,
+                'number_of_installments' => 1,
+                'payment_method' => 'Credit Card',
+                'payment_date' => '2025-01-06',
+                'school_year' => '2025-2026',
+                'status' => 'Paid',
+            ],
+            [
+                'id' => 3,
+                'parent_id' => 10,
+                'invoice_id' => 1,
+                'total_amount' => 100,
+                'paid_amount' => 50,
+                'balance' => 0,
+                'number_of_installments' => 1,
+                'payment_method' => 'Cash',
+                'payment_date' => '2025-01-07',
+                'school_year' => '2025-2026',
+                'status' => 'void',
+            ],
+            [
+                'id' => 4,
+                'parent_id' => 11,
+                'invoice_id' => 2,
+                'total_amount' => 40,
+                'paid_amount' => 10,
+                'balance' => 30,
+                'number_of_installments' => 1,
+                'payment_method' => 'Check',
+                'payment_date' => '2025-01-08',
+                'school_year' => '2025-2026',
+                'status' => 'Paid',
+            ],
+        ]);
+
+        $service = new FinancialPaymentService();
+
+        $payments = $service->paymentsByInvoice('2025-2026', '2025-01-01', '2025-01-31');
+        $breakdown = $service->paymentBreakdown('2025-2026', '2025-01-01', '2025-01-31');
+        $totals = $service->paymentTotals('2025-2026', '2025-01-01', '2025-01-31');
+
+        $map = [];
+        foreach ($payments as $row) {
+            $map[(int) $row['invoice_id']] = (float) $row['paid_amount'];
+        }
+
+        $this->assertSame(50.0, $map[1]);
+        $this->assertSame(10.0, $map[2]);
+
+        $this->assertSame(30.0, (float) ($breakdown[1]['cash'] ?? 0));
+        $this->assertSame(20.0, (float) ($breakdown[1]['credit'] ?? 0));
+        $this->assertSame(10.0, (float) ($breakdown[2]['check'] ?? 0));
+
+        $this->assertSame(60.0, $totals['total_all']);
+        $this->assertSame(30.0, $totals['total_cash']);
+        $this->assertSame(20.0, $totals['total_credit']);
+        $this->assertSame(10.0, $totals['total_check']);
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialPdfReportServiceTest.php b/tests/Unit/Services/Finance/FinancialPdfReportServiceTest.php
new file mode 100644
index 00000000..021c05ad
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialPdfReportServiceTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialChartService;
+use App\Services\Finance\FinancialPdfReportService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class FinancialPdfReportServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_build_pdf_returns_bytes(): void
+    {
+        $service = new FinancialPdfReportService(new FinancialChartService());
+
+        $summary = [
+            'schoolYear' => '2025-2026',
+            'totalCharges' => 100,
+            'totalExtraCharges' => 20,
+            'totalDiscounts' => 10,
+            'totalRefunds' => 5,
+            'totalExpenses' => 15,
+            'totalReimbursements' => 8,
+            'donationToSchool' => 3,
+            'netAmount' => 85,
+            'amountCollected' => 60,
+            'totalUnpaid' => 40,
+        ];
+
+        $pdf = $service->buildPdf($summary);
+
+        $this->assertIsString($pdf);
+        $this->assertNotSame('', $pdf);
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialReportServiceTest.php b/tests/Unit/Services/Finance/FinancialReportServiceTest.php
new file mode 100644
index 00000000..4b92f0d4
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialReportServiceTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialPaymentService;
+use App\Services\Finance\FinancialReportService;
+use App\Services\Finance\FinancialSchoolYearService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class FinancialReportServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_report_returns_grouped_data(): void
+    {
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-001',
+            'total_amount' => 100,
+            'balance' => 40,
+            'paid_amount' => 60,
+            'has_discount' => 1,
+            'issue_date' => '2025-01-01',
+            'due_date' => '2025-02-01',
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 60,
+            'balance' => 40,
+            'number_of_installments' => 1,
+            'payment_method' => 'Cash',
+            'payment_date' => '2025-01-02',
+            'school_year' => '2025-2026',
+            'status' => 'Paid',
+        ]);
+
+        DB::table('refunds')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+            'invoice_id' => 1,
+            'refund_amount' => 5,
+            'status' => 'Paid',
+            'refund_paid_amount' => 5,
+        ]);
+
+        DB::table('discount_usages')->insert([
+            'id' => 1,
+            'voucher_id' => 1,
+            'invoice_id' => 1,
+            'parent_id' => 10,
+            'discount_amount' => 10,
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('expenses')->insert([
+            'id' => 1,
+            'category' => 'Expense',
+            'amount' => 20,
+            'date_of_purchase' => '2025-01-05',
+            'purchased_by' => 10,
+            'added_by' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'status' => 'approved',
+        ]);
+
+        DB::table('reimbursements')->insert([
+            'id' => 1,
+            'expense_id' => 1,
+            'amount' => 15,
+            'reimbursed_to' => 10,
+            'added_by' => 1,
+            'status' => 'Paid',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $service = new FinancialReportService(
+            new FinancialPaymentService(),
+            new FinancialSchoolYearService()
+        );
+
+        $report = $service->getReport('2025-01-01', '2025-12-31', '2025-2026');
+
+        $this->assertSame('2025-2026', $report['selectedYear']);
+        $this->assertSame(['2025-2026'], $report['schoolYears']);
+        $this->assertCount(1, $report['invoices']);
+        $this->assertCount(1, $report['payments']);
+        $this->assertCount(1, $report['refunds']);
+        $this->assertCount(1, $report['discounts']);
+        $this->assertCount(1, $report['expenses']);
+        $this->assertCount(1, $report['reimbursements']);
+        $this->assertSame(60.0, $report['paymentTotals']['total_all']);
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialSchoolYearServiceTest.php b/tests/Unit/Services/Finance/FinancialSchoolYearServiceTest.php
new file mode 100644
index 00000000..af82841c
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialSchoolYearServiceTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialSchoolYearService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class FinancialSchoolYearServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_years_returns_distinct_sorted_years(): void
+    {
+        DB::table('invoices')->insert([
+            [
+                'id' => 1,
+                'parent_id' => 1,
+                'invoice_number' => 'INV-100',
+                'total_amount' => 10,
+                'balance' => 10,
+                'paid_amount' => 0,
+                'has_discount' => 0,
+                'issue_date' => '2024-01-01',
+                'due_date' => '2024-02-01',
+                'status' => 'unpaid',
+                'school_year' => '2024-2025',
+            ],
+            [
+                'id' => 2,
+                'parent_id' => 1,
+                'invoice_number' => 'INV-101',
+                'total_amount' => 10,
+                'balance' => 10,
+                'paid_amount' => 0,
+                'has_discount' => 0,
+                'issue_date' => '2025-01-01',
+                'due_date' => '2025-02-01',
+                'status' => 'unpaid',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        $service = new FinancialSchoolYearService();
+        $years = $service->listYears();
+
+        $this->assertSame(['2025-2026', '2024-2025'], $years);
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialSummaryServiceTest.php b/tests/Unit/Services/Finance/FinancialSummaryServiceTest.php
new file mode 100644
index 00000000..ef01e209
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialSummaryServiceTest.php
@@ -0,0 +1,165 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialDonationRecipientService;
+use App\Services\Finance\FinancialSummaryService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class FinancialSummaryServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_summary_calculates_totals(): void
+    {
+        DB::table('users')->insert([
+            'id' => 2,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'invoice_number' => 'INV-001',
+            'total_amount' => 100,
+            'balance' => 40,
+            'paid_amount' => 60,
+            'has_discount' => 1,
+            'issue_date' => '2025-01-10',
+            'due_date' => '2025-02-10',
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 60,
+            'balance' => 40,
+            'number_of_installments' => 1,
+            'payment_method' => 'Cash',
+            'payment_date' => '2025-01-15',
+            'school_year' => '2025-2026',
+            'status' => 'Paid',
+        ]);
+
+        DB::table('discount_usages')->insert([
+            'id' => 1,
+            'voucher_id' => 1,
+            'invoice_id' => 1,
+            'parent_id' => 2,
+            'discount_amount' => 10,
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('refunds')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'school_year' => '2025-2026',
+            'invoice_id' => 1,
+            'refund_amount' => 5,
+            'status' => 'Paid',
+            'refund_paid_amount' => 5,
+        ]);
+
+        DB::table('additional_charges')->insert([
+            [
+                'id' => 1,
+                'parent_id' => 2,
+                'amount' => 20,
+                'school_year' => '2025-2026',
+                'status' => 'pending',
+            ],
+            [
+                'id' => 2,
+                'parent_id' => 2,
+                'amount' => 30,
+                'invoice_id' => 1,
+                'school_year' => '2025-2026',
+                'status' => 'applied',
+            ],
+        ]);
+
+        DB::table('expenses')->insert([
+            [
+                'id' => 1,
+                'category' => 'Donation',
+                'amount' => 12,
+                'date_of_purchase' => '2025-01-05',
+                'purchased_by' => 2,
+                'added_by' => 1,
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'status' => 'approved',
+            ],
+            [
+                'id' => 2,
+                'category' => 'Expense',
+                'amount' => 8,
+                'date_of_purchase' => '2025-01-06',
+                'purchased_by' => 2,
+                'added_by' => 1,
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+                'status' => 'approved',
+            ],
+        ]);
+
+        DB::table('reimbursements')->insert([
+            [
+                'id' => 1,
+                'expense_id' => 2,
+                'amount' => 15,
+                'reimbursed_to' => 2,
+                'added_by' => 1,
+                'status' => 'Paid',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+            ],
+            [
+                'id' => 2,
+                'expense_id' => 1,
+                'amount' => 7,
+                'reimbursed_to' => 990002,
+                'added_by' => 1,
+                'status' => 'Paid',
+                'school_year' => '2025-2026',
+                'semester' => 'Fall',
+            ],
+        ]);
+
+        $service = new FinancialSummaryService(new FinancialDonationRecipientService());
+        $summary = $service->getSummary('2025-01-01', '2025-12-31', '2025-2026');
+
+        $this->assertSame(120.0, $summary['totalCharges']);
+        $this->assertSame(50.0, $summary['totalExtraCharges']);
+        $this->assertSame(10.0, $summary['totalDiscounts']);
+        $this->assertSame(5.0, $summary['totalRefunds']);
+        $this->assertSame(20.0, $summary['totalExpenses']);
+        $this->assertSame(15.0, $summary['totalReimbursements']);
+        $this->assertSame(19.0, $summary['donationToSchool']);
+        $this->assertSame(60.0, $summary['totalPaid']);
+        $this->assertSame(45.0, $summary['totalUnpaid']);
+        $this->assertSame(105.0, $summary['netAmount']);
+    }
+}
diff --git a/tests/Unit/Services/Finance/FinancialUnpaidParentsServiceTest.php b/tests/Unit/Services/Finance/FinancialUnpaidParentsServiceTest.php
new file mode 100644
index 00000000..42ae9a36
--- /dev/null
+++ b/tests/Unit/Services/Finance/FinancialUnpaidParentsServiceTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Tests\Unit\Services\Finance;
+
+use App\Services\Finance\FinancialSchoolYearService;
+use App\Services\Finance\FinancialUnpaidParentsService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class FinancialUnpaidParentsServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_unpaid_parents_returns_installment_data(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'installment_date', 'config_value' => date('Y-m-t')],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 2,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            [
+                'id' => 1,
+                'parent_id' => 2,
+                'invoice_number' => 'INV-001',
+                'total_amount' => 100,
+                'balance' => 40,
+                'paid_amount' => 60,
+                'has_discount' => 1,
+                'issue_date' => '2025-01-10',
+                'due_date' => '2025-02-10',
+                'status' => 'unpaid',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 60,
+            'balance' => 40,
+            'number_of_installments' => 1,
+            'payment_method' => 'Cash',
+            'payment_date' => '2025-01-15',
+            'school_year' => '2025-2026',
+            'status' => 'Paid',
+        ]);
+
+        DB::table('discount_usages')->insert([
+            'id' => 1,
+            'voucher_id' => 1,
+            'invoice_id' => 1,
+            'parent_id' => 2,
+            'discount_amount' => 10,
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('refunds')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'school_year' => '2025-2026',
+            'invoice_id' => 1,
+            'refund_amount' => 5,
+            'status' => 'Paid',
+            'refund_paid_amount' => 5,
+        ]);
+
+        DB::table('additional_charges')->insert([
+            'id' => 1,
+            'parent_id' => 2,
+            'amount' => 20,
+            'school_year' => '2025-2026',
+            'status' => 'pending',
+        ]);
+
+        $service = new FinancialUnpaidParentsService(new FinancialSchoolYearService());
+        $result = $service->getUnpaidParents('2025-2026');
+
+        $this->assertSame('2025-2026', $result['schoolYear']);
+        $this->assertCount(1, $result['results']);
+
+        $row = $result['results'][0];
+        $this->assertSame(45.0, $row['total_balance']);
+        $this->assertSame('installment', $row['type']);
+        $this->assertSame(1, $row['has_installment']);
+    }
+}
diff --git a/tests/Unit/Services/Grading/GradingBelowSixtyServiceTest.php b/tests/Unit/Services/Grading/GradingBelowSixtyServiceTest.php
new file mode 100644
index 00000000..1981b4f8
--- /dev/null
+++ b/tests/Unit/Services/Grading/GradingBelowSixtyServiceTest.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Tests\Unit\Services\Grading;
+
+use App\Services\Grading\GradingBelowSixtyService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class GradingBelowSixtyServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_rows_returns_students_below_sixty(): void
+    {
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('semester_scores')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'school_id' => 1,
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'semester_score' => 55,
+        ]);
+
+        $service = new GradingBelowSixtyService();
+        $rows = $service->listRows('2025-2026', 'Fall');
+
+        $this->assertCount(1, $rows);
+        $this->assertSame(100, (int) $rows[0]['student_id']);
+        $this->assertSame('Open', $rows[0]['status']);
+    }
+}
diff --git a/tests/Unit/Services/Grading/GradingLockServiceTest.php b/tests/Unit/Services/Grading/GradingLockServiceTest.php
new file mode 100644
index 00000000..2cf59bb0
--- /dev/null
+++ b/tests/Unit/Services/Grading/GradingLockServiceTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Tests\Unit\Services\Grading;
+
+use App\Services\Grading\GradingLockService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class GradingLockServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_toggle_creates_lock(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new GradingLockService();
+        $locked = $service->toggle(1, 'Fall', '2025-2026', 99);
+
+        $this->assertTrue($locked);
+        $this->assertDatabaseHas('grading_locks', [
+            'class_section_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'is_locked' => 1,
+        ]);
+    }
+
+    public function test_lock_all_locks_sections(): void
+    {
+        DB::table('classSection')->insert([
+            [
+                'id' => 1,
+                'class_section_id' => 1,
+                'class_section_name' => '1A',
+                'class_id' => 1,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'class_section_id' => 2,
+                'class_section_name' => '1B',
+                'class_id' => 1,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        $service = new GradingLockService();
+        $count = $service->lockAll('Fall', '2025-2026', 99);
+
+        $this->assertSame(2, $count);
+        $this->assertDatabaseHas('grading_locks', [
+            'class_section_id' => 2,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'is_locked' => 1,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Grading/HomeworkTrackingServiceTest.php b/tests/Unit/Services/Grading/HomeworkTrackingServiceTest.php
new file mode 100644
index 00000000..88ffb099
--- /dev/null
+++ b/tests/Unit/Services/Grading/HomeworkTrackingServiceTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Unit\Services\Grading;
+
+use App\Services\Grading\HomeworkTrackingCalendarService;
+use App\Services\Grading\HomeworkTrackingService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class HomeworkTrackingServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_report_returns_teacher_rows(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Teacher',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'teacher@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('teacher_class')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'teacher_id' => 1,
+            'position' => 'main',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('homework')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'school_id' => 1,
+            'class_section_id' => 1,
+            'updated_by' => 1,
+            'homework_index' => 1,
+            'score' => 90,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $service = new HomeworkTrackingService(new HomeworkTrackingCalendarService());
+        $result = $service->report('Fall', '2025-2026', 1);
+
+        $this->assertNotEmpty($result['teachers']);
+        $this->assertSame(1, $result['teachers'][0]['class_section_id']);
+    }
+}
diff --git a/tests/Unit/Services/Incidents/IncidentAnalysisServiceTest.php b/tests/Unit/Services/Incidents/IncidentAnalysisServiceTest.php
new file mode 100644
index 00000000..36f98db5
--- /dev/null
+++ b/tests/Unit/Services/Incidents/IncidentAnalysisServiceTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Tests\Unit\Services\Incidents;
+
+use App\Services\Incidents\IncidentAnalysisService;
+use App\Services\Incidents\IncidentLookupService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class IncidentAnalysisServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_analyze_groups_incidents_by_student(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('incident')->insert([
+            [
+                'id' => 1,
+                'student_id' => 10,
+                'student_name' => 'Kid Tester',
+                'grade' => '1',
+                'incident' => 'behavior',
+                'incident_datetime' => '2025-01-02 10:00:00',
+                'incident_state' => 'Closed',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'student_id' => 10,
+                'student_name' => 'Kid Tester',
+                'grade' => '1',
+                'incident' => 'behavior',
+                'incident_datetime' => '2025-01-01 10:00:00',
+                'incident_state' => 'Canceled',
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        $service = new IncidentAnalysisService(new IncidentLookupService());
+        $result = $service->analyze('2025-2026', 'Fall');
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Kid Tester', $result[0]['student_name']);
+        $this->assertSame('1A', $result[0]['grade']);
+        $this->assertSame(2, $result[0]['total']);
+        $this->assertSame(1, $result[0]['closed']);
+        $this->assertSame(1, $result[0]['canceled']);
+        $this->assertSame('2025-01-02 10:00:00', $result[0]['last_incident']);
+    }
+}
diff --git a/tests/Unit/Services/Incidents/IncidentHistoryServiceTest.php b/tests/Unit/Services/Incidents/IncidentHistoryServiceTest.php
new file mode 100644
index 00000000..f4a0e8dd
--- /dev/null
+++ b/tests/Unit/Services/Incidents/IncidentHistoryServiceTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Unit\Services\Incidents;
+
+use App\Services\Incidents\IncidentHistoryService;
+use App\Services\Incidents\IncidentLookupService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class IncidentHistoryServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_processed_enriches_grade_and_updater_names(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 5,
+            'class_section_name' => '5A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 3,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('incident')->insert([
+            'student_id' => 1,
+            'student_name' => 'Student One',
+            'grade' => 5,
+            'incident' => 'Test incident',
+            'incident_datetime' => '2025-01-01 10:00:00',
+            'incident_state' => 'open',
+            'updated_by_open' => 3,
+            'open_description' => 'Opened',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new IncidentHistoryService(new IncidentLookupService());
+        $rows = $service->processed('2025-2026', 'Fall');
+
+        $this->assertSame('5A', $rows[0]['grade']);
+        $this->assertSame('Admin User', $rows[0]['updated_by_open_name']);
+    }
+}
diff --git a/tests/Unit/Services/Incidents/IncidentLookupServiceTest.php b/tests/Unit/Services/Incidents/IncidentLookupServiceTest.php
new file mode 100644
index 00000000..20332c33
--- /dev/null
+++ b/tests/Unit/Services/Incidents/IncidentLookupServiceTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Tests\Unit\Services\Incidents;
+
+use App\Services\Incidents\IncidentLookupService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class IncidentLookupServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_grade_options_with_active_students(): void
+    {
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 1,
+            'class_section_id' => 10,
+            'class_section_name' => '1A',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Test',
+            'lastname' => 'Student',
+            'age' => 8,
+            'gender' => 'Male',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 1,
+            'class_section_id' => 10,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new IncidentLookupService();
+        $grades = $service->gradeOptionsWithActiveStudents('2025-2026');
+
+        $this->assertSame([['id' => 10, 'name' => '1A']], $grades);
+    }
+
+    public function test_updater_name_map(): void
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Jane',
+            'lastname' => 'Doe',
+            'cellphone' => '5555555555',
+            'email' => 'jane@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new IncidentLookupService();
+        $map = $service->updaterNameMap([1]);
+
+        $this->assertSame('Jane Doe', $map[1]);
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoiceConfigServiceTest.php b/tests/Unit/Services/Invoices/InvoiceConfigServiceTest.php
new file mode 100644
index 00000000..4e5631f8
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoiceConfigServiceTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceConfigService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class InvoiceConfigServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_config_service_reads_values(): void
+    {
+        DB::table('configuration')->insert([
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+            ['config_key' => 'due_date', 'config_value' => '2025-09-01'],
+            ['config_key' => 'grade_fee', 'config_value' => '9'],
+            ['config_key' => 'first_student_fee', 'config_value' => '350'],
+            ['config_key' => 'second_student_fee', 'config_value' => '200'],
+            ['config_key' => 'youth_fee', 'config_value' => '180'],
+            ['config_key' => 'refund_deadline', 'config_value' => '2025-10-01'],
+        ]);
+
+        $service = new InvoiceConfigService();
+
+        $this->assertSame('2025-2026', $service->getSchoolYear());
+        $this->assertSame('Fall', $service->getSemester());
+        $this->assertSame('2025-09-01', $service->getDueDate());
+        $this->assertSame(9, $service->getGradeFee());
+        $this->assertSame(350.0, $service->getFirstStudentFee());
+        $this->assertSame(200.0, $service->getSecondStudentFee());
+        $this->assertSame(180.0, $service->getYouthFee());
+        $this->assertSame('2025-10-01', $service->getRefundDeadline());
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoiceGenerationServiceTest.php b/tests/Unit/Services/Invoices/InvoiceGenerationServiceTest.php
new file mode 100644
index 00000000..3c37a14e
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoiceGenerationServiceTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceConfigService;
+use App\Services\Invoices\InvoiceGenerationService;
+use App\Services\Invoices\InvoiceGradeService;
+use App\Services\Invoices\InvoiceTuitionService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class InvoiceGenerationServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_generate_invoice_creates_new_invoice(): void
+    {
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('enrollments')->insert([
+            'student_id' => 100,
+            'parent_id' => 10,
+            'class_section_id' => 1,
+            'enrollment_status' => 'enrolled',
+            'school_year' => '2025-2026',
+        ]);
+
+        $config = new InvoiceConfigService();
+        $grades = new InvoiceGradeService($config->getGradeFee());
+        $tuition = new InvoiceTuitionService(
+            $grades,
+            $config->getGradeFee(),
+            $config->getFirstStudentFee(),
+            $config->getSecondStudentFee(),
+            $config->getYouthFee(),
+            $config->getTimezone()
+        );
+        $service = new InvoiceGenerationService($config, $tuition);
+
+        $result = $service->generateInvoice(10, '2025-2026');
+
+        $this->assertTrue($result['ok']);
+        $this->assertNotNull($result['insert_id']);
+        $this->assertDatabaseHas('invoices', [
+            'id' => $result['insert_id'],
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoiceGradeServiceTest.php b/tests/Unit/Services/Invoices/InvoiceGradeServiceTest.php
new file mode 100644
index 00000000..039b8225
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoiceGradeServiceTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceGradeService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class InvoiceGradeServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_grade_parsing_handles_common_cases(): void
+    {
+        $service = new InvoiceGradeService(9);
+
+        $this->assertTrue($service->isKindergarten('KG'));
+        $this->assertSame(1, $service->gradeLevelInt('K'));
+        $this->assertSame(-1, $service->gradeLevelInt('PK'));
+        $this->assertSame(10, $service->gradeLevelInt('Youth'));
+        $this->assertSame(5, $service->gradeLevelInt('Grade 5'));
+
+        $info = $service->getGradeLevel('5A');
+        $this->assertSame(5, $info['level']);
+        $this->assertSame('A', $info['suffix']);
+    }
+
+    public function test_compare_grades_orders_numeric_then_suffix(): void
+    {
+        $service = new InvoiceGradeService(9);
+
+        $this->assertSame(-1, $service->compareGrades('1', '2'));
+        $this->assertSame(1, $service->compareGrades('2', '1'));
+        $this->assertSame(-1, $service->compareGrades('2A', '2B'));
+        $this->assertSame(0, $service->compareGrades('K', 'K'));
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoiceManagementServiceTest.php b/tests/Unit/Services/Invoices/InvoiceManagementServiceTest.php
new file mode 100644
index 00000000..7c3ff7bf
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoiceManagementServiceTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceConfigService;
+use App\Services\Invoices\InvoiceManagementService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class InvoiceManagementServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_management_data_returns_parent_invoice_summary(): void
+    {
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'parent', 'slug' => 'parent', 'is_active' => 1],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 10,
+            'role_id' => 1,
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('enrollments')->insert([
+            'student_id' => 100,
+            'parent_id' => 10,
+            'class_section_id' => 1,
+            'enrollment_status' => 'enrolled',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-001',
+            'total_amount' => 100,
+            'balance' => 100,
+            'paid_amount' => 0,
+            'has_discount' => 0,
+            'issue_date' => '2025-01-10',
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('refunds')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+            'invoice_id' => 1,
+            'refund_amount' => 5,
+            'status' => 'Paid',
+            'refund_paid_amount' => 5,
+        ]);
+
+        $service = new InvoiceManagementService(new InvoiceConfigService());
+        $data = $service->getManagementData('2025-2026');
+
+        $this->assertSame('2025-2026', $data['schoolYear']);
+        $this->assertCount(1, $data['invoices']);
+        $this->assertSame(5.0, $data['invoices'][0]['refund_amount']);
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoicePaymentServiceTest.php b/tests/Unit/Services/Invoices/InvoicePaymentServiceTest.php
new file mode 100644
index 00000000..801c7160
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoicePaymentServiceTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceConfigService;
+use App\Services\Invoices\InvoicePaymentService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class InvoicePaymentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_parent_invoice_summary_includes_refunds_and_last_payment(): void
+    {
+        DB::table('invoices')->insert([
+            [
+                'id' => 1,
+                'parent_id' => 10,
+                'invoice_number' => 'INV-001',
+                'total_amount' => 100,
+                'balance' => 40,
+                'paid_amount' => 60,
+                'has_discount' => 0,
+                'issue_date' => '2025-01-10',
+                'status' => 'unpaid',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 60,
+            'balance' => 40,
+            'number_of_installments' => 1,
+            'payment_method' => 'Cash',
+            'payment_date' => '2025-01-15',
+            'school_year' => '2025-2026',
+            'status' => 'Paid',
+        ]);
+
+        DB::table('refunds')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'school_year' => '2025-2026',
+            'invoice_id' => 1,
+            'refund_amount' => 5,
+            'status' => 'Paid',
+            'refund_paid_amount' => 5,
+        ]);
+
+        $service = new InvoicePaymentService(new InvoiceConfigService());
+        $data = $service->getParentInvoiceSummary(10, '2025-2026');
+
+        $this->assertSame('2025-2026', $data['selectedYear']);
+        $this->assertSame(5.0, $data['invoices'][0]['refund_amount']);
+        $this->assertSame(60.0, $data['invoices'][0]['last_paid_amount']);
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoicePdfServiceTest.php b/tests/Unit/Services/Invoices/InvoicePdfServiceTest.php
new file mode 100644
index 00000000..637c1f24
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoicePdfServiceTest.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceConfigService;
+use App\Services\Invoices\InvoiceGradeService;
+use App\Services\Invoices\InvoicePdfService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class InvoicePdfServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_build_pdf_returns_bytes(): void
+    {
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('classSection')->insert([
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('enrollments')->insert([
+            'student_id' => 100,
+            'parent_id' => 10,
+            'class_section_id' => 1,
+            'enrollment_status' => 'enrolled',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-001',
+            'total_amount' => 100,
+            'balance' => 100,
+            'paid_amount' => 0,
+            'has_discount' => 0,
+            'issue_date' => '2025-01-10',
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+        ]);
+
+        $config = new InvoiceConfigService();
+        $grades = new InvoiceGradeService($config->getGradeFee());
+        $service = new InvoicePdfService($config, $grades);
+
+        $pdf = $service->buildPdf(1);
+
+        $this->assertIsString($pdf);
+        $this->assertNotSame('', $pdf);
+    }
+}
diff --git a/tests/Unit/Services/Invoices/InvoiceTuitionServiceTest.php b/tests/Unit/Services/Invoices/InvoiceTuitionServiceTest.php
new file mode 100644
index 00000000..ebedc709
--- /dev/null
+++ b/tests/Unit/Services/Invoices/InvoiceTuitionServiceTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Unit\Services\Invoices;
+
+use App\Services\Invoices\InvoiceGradeService;
+use App\Services\Invoices\InvoiceTuitionService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class InvoiceTuitionServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_calculate_tuition_fee_counts_regular_and_youth(): void
+    {
+        DB::table('classSection')->insert([
+            ['class_section_id' => 1, 'class_section_name' => '1', 'class_id' => 1],
+            ['class_section_id' => 2, 'class_section_name' => '2', 'class_id' => 2],
+            ['class_section_id' => 3, 'class_section_name' => '10', 'class_id' => 10],
+        ]);
+
+        $grades = new InvoiceGradeService(9);
+        $service = new InvoiceTuitionService($grades, 9, 350.0, 200.0, 180.0, 'UTC');
+
+        $registeredKids = [
+            ['class_section_id' => 1],
+            ['class_section_id' => 2],
+            ['class_section_id' => 3],
+        ];
+
+        $total = $service->calculateTuitionFee($registeredKids, [], date('Y-m-d', strtotime('+10 days')));
+
+        $this->assertSame(730.0, $total);
+    }
+
+    public function test_refund_deadline_includes_withdrawn_when_passed(): void
+    {
+        DB::table('classSection')->insert([
+            ['class_section_id' => 1, 'class_section_name' => '1', 'class_id' => 1],
+            ['class_section_id' => 2, 'class_section_name' => '2', 'class_id' => 2],
+        ]);
+
+        $grades = new InvoiceGradeService(9);
+        $service = new InvoiceTuitionService($grades, 9, 350.0, 200.0, 180.0, 'UTC');
+
+        $registeredKids = [
+            ['class_section_id' => 1],
+        ];
+        $withdrawnKids = [
+            ['class_section_id' => 2],
+        ];
+
+        $totalAllowed = $service->calculateTuitionFee($registeredKids, $withdrawnKids, date('Y-m-d', strtotime('+10 days')));
+        $totalBlocked = $service->calculateTuitionFee($registeredKids, $withdrawnKids, date('Y-m-d', strtotime('-10 days')));
+
+        $this->assertSame(350.0, $totalAllowed);
+        $this->assertSame(550.0, $totalBlocked);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentBalanceServiceTest.php b/tests/Unit/Services/Payments/PaymentBalanceServiceTest.php
new file mode 100644
index 00000000..5fa4e6d7
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentBalanceServiceTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentBalanceService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaymentBalanceServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_update_balance_adjusts_payment_totals(): void
+    {
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 0,
+            'balance' => 100,
+            'number_of_installments' => 1,
+            'payment_method' => 'cash',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Pending',
+        ]);
+
+        $service = new PaymentBalanceService();
+        $updated = $service->updateBalance(1, 40);
+
+        $this->assertTrue($updated);
+        $this->assertDatabaseHas('payments', [
+            'id' => 1,
+            'paid_amount' => 40,
+            'balance' => 60,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentEnrollmentEventServiceTest.php b/tests/Unit/Services/Payments/PaymentEnrollmentEventServiceTest.php
new file mode 100644
index 00000000..6917bbba
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentEnrollmentEventServiceTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentEnrollmentEventService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaymentEnrollmentEventServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_build_event_data_requires_parent(): void
+    {
+        $service = new PaymentEnrollmentEventService();
+
+        $this->expectException(\RuntimeException::class);
+
+        $service->buildEventData(999, [], '2025-2026', 'Fall');
+    }
+
+    public function test_build_event_data_returns_parent_payload_when_no_students(): void
+    {
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '555-555-5555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new PaymentEnrollmentEventService();
+        [$parent, $students] = $service->buildEventData(10, [], '2025-2026', 'Fall', 'https://example.test/login');
+
+        $this->assertSame(10, $parent['user_id']);
+        $this->assertSame('parent@example.com', $parent['email']);
+        $this->assertSame([], $students);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentEventChargesServiceTest.php b/tests/Unit/Services/Payments/PaymentEventChargesServiceTest.php
new file mode 100644
index 00000000..c11f82ca
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentEventChargesServiceTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentEventChargesService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaymentEventChargesServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_enrolled_students_returns_grade(): void
+    {
+        DB::table('students')->insert([
+            'id' => 1,
+            'school_id' => 'S1',
+            'firstname' => 'Student',
+            'lastname' => 'One',
+            'dob' => '2010-01-01',
+            'age' => 14,
+            'gender' => 'Male',
+            'is_active' => 1,
+            'registration_grade' => '5',
+            'is_new' => 1,
+            'photo_consent' => 1,
+            'parent_id' => 10,
+            'registration_date' => '2025-01-01',
+            'tuition_paid' => 0,
+            'rfid_tag' => null,
+            'semester' => 'Fall',
+            'year_of_registration' => '2025',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('enrollments')->insert([
+            'id' => 1,
+            'student_id' => 1,
+            'class_section_id' => 100,
+            'parent_id' => 10,
+            'enrollment_date' => '2025-09-01',
+            'enrollment_status' => 'enrolled',
+            'withdrawal_date' => null,
+            'is_withdrawn' => 0,
+            'admission_status' => 'accepted',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_id' => 9,
+            'class_section_id' => 100,
+            'class_section_name' => 'Section A',
+            'created_at' => null,
+            'updated_at' => null,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => 1,
+            'class_section_id' => 100,
+            'is_event_only' => 0,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'description' => null,
+            'created_at' => '2025-09-01 00:00:00',
+            'updated_at' => '2025-09-01 00:00:00',
+            'updated_by' => null,
+        ]);
+
+        $service = new PaymentEventChargesService();
+        $students = $service->getEnrolledStudents(10, '2025-2026');
+
+        $this->assertCount(1, $students);
+        $this->assertSame(1, $students[0]['id']);
+        $this->assertSame('9', (string) $students[0]['grade']);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentLookupServiceTest.php b/tests/Unit/Services/Payments/PaymentLookupServiceTest.php
new file mode 100644
index 00000000..a47e0fd1
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentLookupServiceTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentLookupService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaymentLookupServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_by_parent_filters_school_year(): void
+    {
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 20,
+            'balance' => 80,
+            'number_of_installments' => 1,
+            'payment_method' => 'cash',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Pending',
+        ]);
+
+        DB::table('payments')->insert([
+            'id' => 2,
+            'parent_id' => 10,
+            'invoice_id' => 2,
+            'total_amount' => 100,
+            'paid_amount' => 20,
+            'balance' => 80,
+            'number_of_installments' => 1,
+            'payment_method' => 'cash',
+            'payment_date' => '2024-01-01',
+            'school_year' => '2024-2025',
+            'status' => 'Pending',
+        ]);
+
+        $service = new PaymentLookupService();
+        $results = $service->getByParent(10, '2025-2026');
+
+        $this->assertCount(1, $results);
+        $this->assertSame(1, $results[0]['id']);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentManualServiceTest.php b/tests/Unit/Services/Payments/PaymentManualServiceTest.php
new file mode 100644
index 00000000..3f80961c
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentManualServiceTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Discounts\DiscountInvoiceService;
+use App\Services\Payments\PaymentEnrollmentEventService;
+use App\Services\Payments\PaymentManualService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Mockery;
+use Tests\TestCase;
+
+class PaymentManualServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_record_payment_rejects_invalid_method(): void
+    {
+        $invoiceService = Mockery::mock(DiscountInvoiceService::class);
+        $enrollmentService = Mockery::mock(PaymentEnrollmentEventService::class);
+
+        $service = new PaymentManualService($invoiceService, $enrollmentService);
+
+        $this->expectException(\InvalidArgumentException::class);
+
+        $service->recordPayment(1, 10.0, 'wire', null, null, null, null);
+    }
+
+    public function test_suggest_returns_matches(): void
+    {
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '555-555-5555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $invoiceService = Mockery::mock(DiscountInvoiceService::class);
+        $enrollmentService = Mockery::mock(PaymentEnrollmentEventService::class);
+
+        $service = new PaymentManualService($invoiceService, $enrollmentService);
+        $results = $service->suggest('parent@example.com');
+
+        $this->assertCount(1, $results);
+        $this->assertSame('parent@example.com', $results[0]['value']);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentNotificationDispatchServiceTest.php b/tests/Unit/Services/Payments/PaymentNotificationDispatchServiceTest.php
new file mode 100644
index 00000000..d27d7dc6
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentNotificationDispatchServiceTest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentNotificationDispatchService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaymentNotificationDispatchServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_notify_user_creates_notification_records(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 2001, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2002, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        $service = new PaymentNotificationDispatchService();
+        $service->notifyUser(10, 'Payment Reminder', 'Reminder body', ['in_app']);
+
+        $this->assertDatabaseHas('notifications', [
+            'title' => 'Payment Reminder',
+            'message' => 'Reminder body',
+            'target_group' => 'user',
+            'status' => 'sent',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $this->assertDatabaseHas('user_notifications', [
+            'user_id' => 10,
+            'delivered' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentNotificationServiceTest.php b/tests/Unit/Services/Payments/PaymentNotificationServiceTest.php
new file mode 100644
index 00000000..4618093e
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentNotificationServiceTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\EmailService;
+use App\Services\Payments\PaymentNotificationDispatchService;
+use App\Services\Payments\PaymentNotificationService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Mockery;
+use Tests\TestCase;
+
+class PaymentNotificationServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_send_records_log_and_returns_sent_count(): void
+    {
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '555-555-5555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-1',
+            'total_amount' => 100,
+            'balance' => 100,
+            'paid_amount' => 0,
+            'has_discount' => 0,
+            'issue_date' => '2025-01-01',
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $emailService = Mockery::mock(EmailService::class);
+        $emailService->shouldReceive('send')
+            ->once()
+            ->with(
+                'parent@example.com',
+                Mockery::type('string'),
+                Mockery::type('string'),
+                'finance'
+            )
+            ->andReturn(true);
+
+        $dispatchService = Mockery::mock(PaymentNotificationDispatchService::class);
+        $dispatchService->shouldNotReceive('notifyUser');
+
+        $service = new PaymentNotificationService($emailService, $dispatchService);
+        $result = $service->send([
+            'parent_id' => 10,
+            'type' => 'installment',
+            'school_year' => '2025-2026',
+        ]);
+
+        $this->assertSame(1, $result['sent']);
+        $this->assertDatabaseHas('payment_notification_logs', [
+            'parent_id' => 10,
+            'status' => 'sent',
+            'type' => 'installment',
+        ]);
+    }
+
+    public function test_list_logs_filters_by_type(): void
+    {
+        DB::table('users')->insert([
+            'id' => 11,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'Two',
+            'cellphone' => '555-555-5556',
+            'email' => 'parent2@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('payment_notification_logs')->insert([
+            'id' => 1,
+            'parent_id' => 11,
+            'invoice_id' => null,
+            'school_year' => '2025-2026',
+            'period_year' => 2025,
+            'period_month' => 9,
+            'type' => 'installment',
+            'to_email' => 'parent2@example.com',
+            'cc_email' => null,
+            'head_fa_notified' => 0,
+            'subject' => 'Reminder',
+            'body' => 'Body',
+            'status' => 'sent',
+            'error_message' => null,
+            'balance_snapshot' => 50,
+            'sent_at' => '2025-09-01 00:00:00',
+        ]);
+
+        $emailService = Mockery::mock(EmailService::class);
+        $dispatchService = Mockery::mock(PaymentNotificationDispatchService::class);
+        $service = new PaymentNotificationService($emailService, $dispatchService);
+
+        $logs = $service->listLogs(null, null, 'installment');
+
+        $this->assertCount(1, $logs);
+        $this->assertSame(11, $logs[0]->parent_id);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentPlanServiceTest.php b/tests/Unit/Services/Payments/PaymentPlanServiceTest.php
new file mode 100644
index 00000000..119ffa30
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentPlanServiceTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentPlanService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaymentPlanServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_plan_uses_defaults_when_missing(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 2001, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2002, 'config_key' => 'semester', 'config_value' => 'Fall'],
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 10,
+            'school_id' => 1,
+            'firstname' => 'Parent',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('invoices')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_number' => 'INV-1',
+            'total_amount' => 200,
+            'balance' => 200,
+            'paid_amount' => 0,
+            'has_discount' => 0,
+            'issue_date' => '2025-01-01',
+            'status' => 'unpaid',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $service = new PaymentPlanService();
+        $payment = $service->createPlan([
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 200,
+            'number_of_installments' => 2,
+            'payment_date' => '2025-01-01',
+            'payment_method' => 'cash',
+        ]);
+
+        $this->assertSame('2025-2026', $payment->school_year);
+        $this->assertSame('Fall', $payment->semester);
+        $this->assertSame(200.0, (float) $payment->total_amount);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaymentTransactionServiceTest.php b/tests/Unit/Services/Payments/PaymentTransactionServiceTest.php
new file mode 100644
index 00000000..aaf648ea
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaymentTransactionServiceTest.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaymentTransactionService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Tests\TestCase;
+
+class PaymentTransactionServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_and_update_transaction(): void
+    {
+        if (!Schema::hasColumn('payment_transactions', 'payment_reference')) {
+            Schema::table('payment_transactions', function (Blueprint $table) {
+                $table->string('payment_reference')->nullable();
+            });
+        }
+
+        if (!Schema::hasColumn('payment_transactions', 'is_full_payment')) {
+            Schema::table('payment_transactions', function (Blueprint $table) {
+                $table->boolean('is_full_payment')->default(0);
+            });
+        }
+
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 0,
+            'balance' => 100,
+            'number_of_installments' => 1,
+            'payment_method' => 'card',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Pending',
+        ]);
+
+        $service = new PaymentTransactionService();
+        $transaction = $service->create([
+            'transaction_id' => 'TXN-1',
+            'payment_id' => 1,
+            'transaction_date' => '2025-01-02 00:00:00',
+            'amount' => 50,
+            'payment_method' => 'card',
+            'payment_status' => 'Pending',
+            'transaction_fee' => 1.25,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $this->assertSame('TXN-1', $transaction->transaction_id);
+
+        $updated = $service->updateStatus('TXN-1', 'Completed');
+
+        $this->assertTrue($updated);
+        $this->assertDatabaseHas('payment_transactions', [
+            'transaction_id' => 'TXN-1',
+            'payment_status' => 'Completed',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaypalPaymentServiceTest.php b/tests/Unit/Services/Payments/PaypalPaymentServiceTest.php
new file mode 100644
index 00000000..9bb032cc
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaypalPaymentServiceTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaypalPaymentService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaypalPaymentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_payment_falls_back_to_hosted_when_sdk_missing(): void
+    {
+        DB::table('payments')->insert([
+            'id' => 1,
+            'parent_id' => 10,
+            'invoice_id' => 1,
+            'total_amount' => 100,
+            'paid_amount' => 0,
+            'balance' => 100,
+            'number_of_installments' => 1,
+            'payment_method' => 'card',
+            'payment_date' => '2025-01-01',
+            'school_year' => '2025-2026',
+            'status' => 'Pending',
+        ]);
+
+        $service = new PaypalPaymentService();
+        $result = $service->createPayment(1);
+
+        $this->assertSame('hosted', $result['mode']);
+        $this->assertSame($service->getRedirectUrl(), $result['redirect_url']);
+    }
+
+    public function test_execute_payment_throws_when_sdk_missing(): void
+    {
+        $service = new PaypalPaymentService();
+
+        $this->expectException(\RuntimeException::class);
+
+        $service->executePayment('payer');
+    }
+}
diff --git a/tests/Unit/Services/Payments/PaypalTransactionsServiceTest.php b/tests/Unit/Services/Payments/PaypalTransactionsServiceTest.php
new file mode 100644
index 00000000..2e2759fb
--- /dev/null
+++ b/tests/Unit/Services/Payments/PaypalTransactionsServiceTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Unit\Services\Payments;
+
+use App\Services\Payments\PaypalTransactionsService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class PaypalTransactionsServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_all_filters_by_keyword(): void
+    {
+        DB::table('paypal_payments')->insert([
+            'id' => 1,
+            'transaction_id' => 'TXN-ABC',
+            'payer_email' => 'payer@example.com',
+            'event_type' => 'PAYMENT',
+            'order_id' => 'ORDER-1',
+            'parent_school_id' => 'P1',
+            'amount' => 50,
+            'currency' => 'USD',
+            'created_at' => '2025-01-01 00:00:00',
+        ]);
+
+        DB::table('paypal_payments')->insert([
+            'id' => 2,
+            'transaction_id' => 'TXN-DEF',
+            'payer_email' => 'other@example.com',
+            'event_type' => 'REFUND',
+            'order_id' => 'ORDER-2',
+            'parent_school_id' => 'P2',
+            'amount' => 75,
+            'currency' => 'USD',
+            'created_at' => '2025-01-02 00:00:00',
+        ]);
+
+        $service = new PaypalTransactionsService();
+        $results = $service->listAll('ABC');
+
+        $this->assertCount(1, $results);
+        $this->assertStringContainsString('TXN-ABC', json_encode($results));
+    }
+}
diff --git a/tests/Unit/Services/Reimbursements/ReimbursementBatchAssignmentServiceTest.php b/tests/Unit/Services/Reimbursements/ReimbursementBatchAssignmentServiceTest.php
new file mode 100644
index 00000000..7d4e2ee5
--- /dev/null
+++ b/tests/Unit/Services/Reimbursements/ReimbursementBatchAssignmentServiceTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Tests\Unit\Services\Reimbursements;
+
+use App\Services\Reimbursements\ReimbursementBatchAssignmentService;
+use App\Services\Reimbursements\ReimbursementLookupService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ReimbursementBatchAssignmentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_assign_and_unassign_batch_item(): void
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('reimbursement_batches')->insert([
+            'id' => 10,
+            'title' => 'Batch 10',
+            'status' => 'open',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'opened_at' => now(),
+        ]);
+
+        DB::table('expenses')->insert([
+            'id' => 100,
+            'category' => 'Expense',
+            'amount' => 25.00,
+            'date_of_purchase' => '2025-01-01',
+            'added_by' => 1,
+            'purchased_by' => 1,
+            'status' => 'approved',
+        ]);
+
+        $service = new ReimbursementBatchAssignmentService(new ReimbursementLookupService());
+
+        $result = $service->updateAssignment(100, 10, 1, null, '2025-2026', 'Fall');
+        $this->assertSame(10, $result['batch_id']);
+
+        $this->assertDatabaseHas('reimbursement_batch_items', [
+            'batch_id' => 10,
+            'expense_id' => 100,
+            'admin_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+
+        $service->updateAssignment(100, 0, null, null, '2025-2026', 'Fall');
+
+        $this->assertDatabaseHas('reimbursement_batch_items', [
+            'batch_id' => 10,
+            'expense_id' => 100,
+        ]);
+
+        $this->assertDatabaseMissing('reimbursement_batch_items', [
+            'batch_id' => 10,
+            'expense_id' => 100,
+            'unassigned_at' => null,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Reimbursements/ReimbursementBatchServiceTest.php b/tests/Unit/Services/Reimbursements/ReimbursementBatchServiceTest.php
new file mode 100644
index 00000000..632d2bed
--- /dev/null
+++ b/tests/Unit/Services/Reimbursements/ReimbursementBatchServiceTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Unit\Services\Reimbursements;
+
+use App\Services\Reimbursements\ReimbursementBatchService;
+use App\Services\Reimbursements\ReimbursementLookupService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class ReimbursementBatchServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_batch_assigns_sequence_and_title(): void
+    {
+        $service = new ReimbursementBatchService(new ReimbursementLookupService());
+
+        $batch = $service->createBatch(null, 1, '2025-2026', 'Fall');
+
+        $this->assertSame(1, $batch['sequence']);
+        $this->assertStringContainsString('Batch', $batch['label']);
+
+        $this->assertDatabaseHas('reimbursement_batches', [
+            'id' => $batch['batch_id'],
+            'status' => 'open',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Reimbursements/ReimbursementDonationServiceTest.php b/tests/Unit/Services/Reimbursements/ReimbursementDonationServiceTest.php
new file mode 100644
index 00000000..a6a1cbcc
--- /dev/null
+++ b/tests/Unit/Services/Reimbursements/ReimbursementDonationServiceTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Unit\Services\Reimbursements;
+
+use App\Services\Reimbursements\ReimbursementDonationService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ReimbursementDonationServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_mark_donation_updates_expense_and_unassigns(): void
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Admin',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'admin@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('expenses')->insert([
+            'id' => 200,
+            'category' => 'Expense',
+            'amount' => 40.00,
+            'date_of_purchase' => '2025-02-01',
+            'added_by' => 1,
+            'purchased_by' => 1,
+            'status' => 'approved',
+        ]);
+
+        DB::table('reimbursement_batches')->insert([
+            'id' => 5,
+            'title' => 'Batch 5',
+            'status' => 'open',
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'opened_at' => now(),
+        ]);
+
+        DB::table('reimbursement_batch_items')->insert([
+            'batch_id' => 5,
+            'expense_id' => 200,
+            'assigned_at' => now(),
+        ]);
+
+        $service = new ReimbursementDonationService();
+        $service->markDonation(200, 1);
+
+        $this->assertDatabaseHas('expenses', [
+            'id' => 200,
+            'category' => 'Donation',
+            'status' => 'approved',
+        ]);
+
+        $this->assertDatabaseMissing('reimbursement_batch_items', [
+            'batch_id' => 5,
+            'expense_id' => 200,
+            'unassigned_at' => null,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Reimbursements/ReimbursementRecipientServiceTest.php b/tests/Unit/Services/Reimbursements/ReimbursementRecipientServiceTest.php
new file mode 100644
index 00000000..a9665b59
--- /dev/null
+++ b/tests/Unit/Services/Reimbursements/ReimbursementRecipientServiceTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace Tests\Unit\Services\Reimbursements;
+
+use App\Services\Reimbursements\ReimbursementRecipientService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ReimbursementRecipientServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_recipient_options_include_staff_and_specials(): void
+    {
+        DB::table('users')->insert([
+            [
+                'id' => 1,
+                'school_id' => 1,
+                'firstname' => 'Admin',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'admin@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'id' => 2,
+                'school_id' => 1,
+                'firstname' => 'Parent',
+                'lastname' => 'User',
+                'cellphone' => '5555555555',
+                'email' => 'parent@example.com',
+                'address_street' => '123 Main',
+                'city' => 'City',
+                'state' => 'ST',
+                'zip' => '12345',
+                'accept_school_policy' => 1,
+                'is_verified' => 1,
+                'status' => 'Active',
+                'is_suspended' => 0,
+                'failed_attempts' => 0,
+                'password' => bcrypt('secret'),
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        DB::table('roles')->insert([
+            ['id' => 1, 'name' => 'admin'],
+            ['id' => 2, 'name' => 'parent'],
+        ]);
+
+        DB::table('user_roles')->insert([
+            ['user_id' => 1, 'role_id' => 1],
+            ['user_id' => 2, 'role_id' => 2],
+        ]);
+
+        $service = new ReimbursementRecipientService();
+        $recipients = $service->recipientOptions();
+
+        $ids = array_map(static fn ($row) => (int) ($row['id'] ?? 0), $recipients);
+
+        $this->assertContains(1, $ids);
+        $this->assertNotContains(2, $ids);
+        $this->assertContains(990001, $ids);
+        $this->assertContains(990002, $ids);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ExamScoreServiceTest.php b/tests/Unit/Services/Scores/ExamScoreServiceTest.php
new file mode 100644
index 00000000..991e58a1
--- /dev/null
+++ b/tests/Unit/Services/Scores/ExamScoreServiceTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ExamScoreService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ExamScoreServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_latest_exam_score(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Leo', 'Park');
+        $this->seedStudentClass(1, 3, '2025-2026');
+
+        DB::table('midterm_exam')->insert([
+            [
+                'student_id' => 1,
+                'school_id' => 'SCH1',
+                'class_section_id' => 3,
+                'updated_by' => 99,
+                'score' => 70,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+            [
+                'student_id' => 1,
+                'school_id' => 'SCH1',
+                'class_section_id' => 3,
+                'updated_by' => 99,
+                'score' => 80,
+                'semester' => 'Fall',
+                'school_year' => '2025-2026',
+            ],
+        ]);
+
+        $service = new ExamScoreService(new ScoreTermService());
+        $result = $service->list('midterm_exam', 3, 'Fall', '2025-2026');
+
+        $this->assertCount(1, $result['students']);
+        $this->assertSame(80.0, $result['students'][0]['score']);
+    }
+
+    public function test_update_creates_exam_score_and_missing_override(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Leo', 'Park');
+        $this->seedStudentClass(1, 3, '2025-2026');
+
+        $service = new ExamScoreService(new ScoreTermService());
+
+        $count = $service->update(
+            'midterm_exam',
+            3,
+            'Fall',
+            '2025-2026',
+            [1 => ['score' => 95]],
+            [1 => true],
+            99
+        );
+
+        $this->assertSame(1, $count);
+        $this->assertDatabaseHas('midterm_exam', [
+            'student_id' => 1,
+            'class_section_id' => 3,
+            'score' => 95.0,
+        ]);
+        $this->assertDatabaseHas('missing_score_overrides', [
+            'student_id' => 1,
+            'class_section_id' => 3,
+            'item_type' => 'midterm_exam',
+            'item_index' => null,
+            'is_allowed' => 1,
+        ]);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 11,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/HomeworkScoreServiceTest.php b/tests/Unit/Services/Scores/HomeworkScoreServiceTest.php
new file mode 100644
index 00000000..95bba07d
--- /dev/null
+++ b/tests/Unit/Services/Scores/HomeworkScoreServiceTest.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\HomeworkScoreService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class HomeworkScoreServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_includes_semester_variants(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Eli', 'Page');
+        $this->seedStudentClass(1, 8, '2025-2026');
+
+        DB::table('homework')->insert([
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 8,
+            'updated_by' => 99,
+            'homework_index' => 1,
+            'score' => 91,
+            'semester' => 'First Semester',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new HomeworkScoreService(new ScoreTermService());
+        $result = $service->list(8, 'Fall', '2025-2026');
+
+        $this->assertSame([1], $result['headers']);
+        $this->assertSame(91.0, $result['students'][0]['scores'][1]);
+    }
+
+    public function test_add_column_inserts_next_index(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Eli', 'Page');
+        $this->seedStudentClass(1, 8, '2025-2026');
+
+        $service = new HomeworkScoreService(new ScoreTermService());
+
+        $nextIndex = $service->addColumn(8, 'Fall', '2025-2026', 99);
+
+        $this->assertSame(1, $nextIndex);
+        $this->assertDatabaseHas('homework', [
+            'student_id' => 1,
+            'class_section_id' => 8,
+            'homework_index' => 1,
+        ]);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ParticipationScoreServiceTest.php b/tests/Unit/Services/Scores/ParticipationScoreServiceTest.php
new file mode 100644
index 00000000..56829a8b
--- /dev/null
+++ b/tests/Unit/Services/Scores/ParticipationScoreServiceTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ParticipationScoreService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ParticipationScoreServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_participation_scores(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Owen', 'Hall');
+        $this->seedStudentClass(1, 9, '2025-2026');
+
+        DB::table('participation')->insert([
+            'id' => 1,
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 9,
+            'updated_by' => 99,
+            'score' => 87,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ParticipationScoreService(new ScoreTermService());
+        $result = $service->list(9, 'Fall', '2025-2026');
+
+        $this->assertSame(87.0, $result['students'][0]['scores']['score']);
+    }
+
+    public function test_update_updates_existing_scores(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Owen', 'Hall');
+        $this->seedStudentClass(1, 9, '2025-2026');
+
+        DB::table('participation')->insert([
+            'id' => 1,
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 9,
+            'updated_by' => 99,
+            'score' => 70,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ParticipationScoreService(new ScoreTermService());
+        $count = $service->update(
+            9,
+            'Fall',
+            '2025-2026',
+            [1 => ['score' => 92]],
+            [],
+            99
+        );
+
+        $this->assertSame(1, $count);
+        $this->assertDatabaseHas('participation', [
+            'id' => 1,
+            'student_id' => 1,
+            'score' => 92.0,
+        ]);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ProjectScoreServiceTest.php b/tests/Unit/Services/Scores/ProjectScoreServiceTest.php
new file mode 100644
index 00000000..b27c8f7b
--- /dev/null
+++ b/tests/Unit/Services/Scores/ProjectScoreServiceTest.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ProjectScoreService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ProjectScoreServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_headers_and_scores(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Maya', 'Stone');
+        $this->seedStudentClass(1, 10, '2025-2026');
+
+        DB::table('project')->insert([
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 10,
+            'updated_by' => 99,
+            'project_index' => 1,
+            'score' => 88,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ProjectScoreService(new ScoreTermService());
+        $result = $service->list(10, 'Fall', '2025-2026');
+
+        $this->assertSame([1], $result['headers']);
+        $this->assertCount(1, $result['students']);
+        $this->assertSame(88.0, $result['students'][0]['scores'][1]);
+    }
+
+    public function test_update_creates_scores_and_missing_overrides(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Maya', 'Stone');
+        $this->seedStudentClass(1, 10, '2025-2026');
+
+        $service = new ProjectScoreService(new ScoreTermService());
+
+        $count = $service->update(
+            10,
+            'Fall',
+            '2025-2026',
+            [1 => [1 => '92']],
+            [1 => [1 => true]],
+            99
+        );
+
+        $this->assertSame(1, $count);
+        $this->assertDatabaseHas('project', [
+            'student_id' => 1,
+            'class_section_id' => 10,
+            'project_index' => 1,
+            'score' => 92.0,
+        ]);
+        $this->assertDatabaseHas('missing_score_overrides', [
+            'student_id' => 1,
+            'class_section_id' => 10,
+            'item_type' => 'project',
+            'item_index' => 1,
+            'is_allowed' => 1,
+        ]);
+    }
+
+    public function test_add_column_inserts_next_index(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Maya', 'Stone');
+        $this->seedStudentClass(1, 10, '2025-2026');
+
+        $service = new ProjectScoreService(new ScoreTermService());
+
+        $nextIndex = $service->addColumn(10, 'Fall', '2025-2026', 99);
+
+        $this->assertSame(1, $nextIndex);
+        $this->assertDatabaseHas('project', [
+            'student_id' => 1,
+            'class_section_id' => 10,
+            'project_index' => 1,
+        ]);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/QuizScoreServiceTest.php b/tests/Unit/Services/Scores/QuizScoreServiceTest.php
new file mode 100644
index 00000000..2be158e8
--- /dev/null
+++ b/tests/Unit/Services/Scores/QuizScoreServiceTest.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\QuizScoreService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class QuizScoreServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_headers_and_scores(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Nina', 'Kim');
+        $this->seedStudentClass(1, 5, '2025-2026');
+
+        DB::table('quiz')->insert([
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 5,
+            'updated_by' => 99,
+            'quiz_index' => 2,
+            'score' => 77,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new QuizScoreService(new ScoreTermService());
+        $result = $service->list(5, 'Fall', '2025-2026');
+
+        $this->assertSame([2], $result['headers']);
+        $this->assertCount(1, $result['students']);
+        $this->assertSame(77.0, $result['students'][0]['scores'][2]);
+    }
+
+    public function test_update_creates_scores_and_missing_overrides(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Nina', 'Kim');
+        $this->seedStudentClass(1, 5, '2025-2026');
+
+        $service = new QuizScoreService(new ScoreTermService());
+
+        $count = $service->update(
+            5,
+            'Fall',
+            '2025-2026',
+            [1 => [1 => '85']],
+            [1 => [1 => true]],
+            99
+        );
+
+        $this->assertSame(1, $count);
+        $this->assertDatabaseHas('quiz', [
+            'student_id' => 1,
+            'class_section_id' => 5,
+            'quiz_index' => 1,
+            'score' => 85.0,
+        ]);
+        $this->assertDatabaseHas('missing_score_overrides', [
+            'student_id' => 1,
+            'class_section_id' => 5,
+            'item_type' => 'quiz',
+            'item_index' => 1,
+            'is_allowed' => 1,
+        ]);
+    }
+
+    public function test_add_column_inserts_next_index(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Nina', 'Kim');
+        $this->seedStudentClass(1, 5, '2025-2026');
+
+        $service = new QuizScoreService(new ScoreTermService());
+
+        $nextIndex = $service->addColumn(5, 'Fall', '2025-2026', 99);
+
+        $this->assertSame(1, $nextIndex);
+        $this->assertDatabaseHas('quiz', [
+            'student_id' => 1,
+            'class_section_id' => 5,
+            'quiz_index' => 1,
+        ]);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 10,
+            'gender' => 'F',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ScoreCommentServiceTest.php b/tests/Unit/Services/Scores/ScoreCommentServiceTest.php
new file mode 100644
index 00000000..63a13f20
--- /dev/null
+++ b/tests/Unit/Services/Scores/ScoreCommentServiceTest.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ScoreCommentService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ScoreCommentServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_comments_for_students(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Ava', 'Lane');
+        $this->seedStudentClass(1, 2, '2025-2026');
+
+        DB::table('score_comments')->insert([
+            'student_id' => 1,
+            'class_section_id' => 2,
+            'score_type' => 'midterm',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+            'comment' => 'Ava has shown consistent improvement and strong effort across assignments.',
+        ]);
+
+        $service = new ScoreCommentService(new ScoreTermService());
+        $result = $service->list('2', 'Fall', '2025-2026');
+
+        $this->assertCount(1, $result['students']);
+        $this->assertSame('Ava', $result['students'][0]['firstname']);
+        $this->assertSame('midterm', array_key_first($result['comments'][1]));
+    }
+
+    public function test_save_returns_validation_errors_for_short_comment(): void
+    {
+        $this->seedStudent(1, 'SCH1', 'Ava', 'Lane');
+
+        $service = new ScoreCommentService(new ScoreTermService());
+        $result = $service->save(
+            2,
+            'Fall',
+            '2025-2026',
+            [1 => ['midterm' => 'Too short']],
+            [],
+            99
+        );
+
+        $this->assertNotEmpty($result['errors']);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 10,
+            'gender' => 'F',
+            'photo_consent' => 1,
+            'parent_id' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ScoreDashboardServiceTest.php b/tests/Unit/Services/Scores/ScoreDashboardServiceTest.php
new file mode 100644
index 00000000..bc773bcc
--- /dev/null
+++ b/tests/Unit/Services/Scores/ScoreDashboardServiceTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ScoreDashboardService;
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ScoreDashboardServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_overview_returns_students_and_scores(): void
+    {
+        $this->seedClassSection(10, '1A');
+        $this->seedStudent(1, 'SCH1', 'Noah', 'West', 5);
+        $this->seedStudentClass(1, 10, '2025-2026');
+
+        DB::table('teacher_class')->insert([
+            'teacher_id' => 1,
+            'class_section_id' => 10,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('semester_scores')->insert([
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 10,
+            'homework_avg' => 85,
+            'quiz_avg' => 90,
+            'project_avg' => 92,
+            'attendance_score' => 95,
+            'ptap_score' => 90,
+            'semester_score' => 91,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ScoreDashboardService(new ScoreTermService());
+        $result = $service->overview(1, null, 'Fall', '2025-2026');
+
+        $this->assertSame(10, $result['class_section_id']);
+        $this->assertSame('1A', $result['class_section_name']);
+        $this->assertSame(85.0, $result['students'][0]['scores']['homework']);
+    }
+
+    public function test_view_student_scores_groups_by_year_and_semester(): void
+    {
+        $this->seedClassSection(10, '1A');
+        $this->seedStudent(2, 'SCH2', 'Mia', 'Clark', 7);
+        $this->seedStudentClass(2, 10, '2025-2026');
+
+        DB::table('semester_scores')->insert([
+            'student_id' => 2,
+            'school_id' => 'SCH2',
+            'class_section_id' => 10,
+            'homework_avg' => 80,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new ScoreDashboardService(new ScoreTermService());
+        $result = $service->viewStudentScores(7, '2025-2026');
+
+        $this->assertArrayHasKey('2025-2026', $result['scores']);
+        $this->assertArrayHasKey('Fall', $result['scores']['2025-2026']);
+        $this->assertArrayHasKey(2, $result['scores']['2025-2026']['Fall']);
+    }
+
+    private function seedStudent(int $id, string $schoolId, string $first, string $last, int $parentId): void
+    {
+        DB::table('students')->insert([
+            'id' => $id,
+            'school_id' => $schoolId,
+            'firstname' => $first,
+            'lastname' => $last,
+            'age' => 12,
+            'gender' => 'F',
+            'photo_consent' => 1,
+            'parent_id' => $parentId,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+    }
+
+    private function seedStudentClass(int $studentId, int $classSectionId, string $schoolYear): void
+    {
+        DB::table('student_class')->insert([
+            'student_id' => $studentId,
+            'class_section_id' => $classSectionId,
+            'school_year' => $schoolYear,
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+    }
+
+    private function seedClassSection(int $classSectionId, string $name): void
+    {
+        DB::table('classSection')->insert([
+            'class_section_id' => $classSectionId,
+            'class_section_name' => $name,
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ScorePredictorServiceTest.php b/tests/Unit/Services/Scores/ScorePredictorServiceTest.php
new file mode 100644
index 00000000..fca60523
--- /dev/null
+++ b/tests/Unit/Services/Scores/ScorePredictorServiceTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ScorePredictorDataService;
+use App\Services\Scores\ScorePredictorRiskService;
+use App\Services\Scores\ScorePredictorService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ScorePredictorServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_report_builds_predictions(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'school_year', 'config_value' => '2025-2026'],
+            ['id' => 2, 'config_key' => 'semester', 'config_value' => 'Fall'],
+            ['id' => 3, 'config_key' => 'trophy_score', 'config_value' => '94'],
+            ['id' => 4, 'config_key' => 'pass_score', 'config_value' => '60'],
+        ]);
+
+        DB::table('classSection')->insert([
+            'id' => 1,
+            'class_section_id' => 1,
+            'class_section_name' => '1A',
+            'class_id' => 1,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('students')->insert([
+            'id' => 100,
+            'parent_id' => 10,
+            'firstname' => 'Kid',
+            'lastname' => 'User',
+            'school_id' => 1,
+            'age' => 10,
+            'gender' => 'M',
+            'photo_consent' => 1,
+            'year_of_registration' => '2025',
+            'is_active' => 1,
+        ]);
+
+        DB::table('student_class')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'class_section_id' => 1,
+            'school_year' => '2025-2026',
+            'semester' => 'Fall',
+            'is_event_only' => 0,
+        ]);
+
+        DB::table('semester_scores')->insert([
+            'id' => 1,
+            'student_id' => 100,
+            'school_id' => 1,
+            'class_section_id' => 1,
+            'semester' => 'fall',
+            'school_year' => '2025-2026',
+            'semester_score' => 92,
+        ]);
+
+        $service = new ScorePredictorService(
+            new ScorePredictorDataService(),
+            new ScorePredictorRiskService()
+        );
+
+        $result = $service->report('2025-2026', 1);
+
+        $this->assertSame('2025-2026', $result['school_year']);
+        $this->assertCount(1, $result['students']);
+        $this->assertSame(100, $result['students'][0]['student_id']);
+    }
+}
diff --git a/tests/Unit/Services/Scores/ScoreTermServiceTest.php b/tests/Unit/Services/Scores/ScoreTermServiceTest.php
new file mode 100644
index 00000000..8c3a6093
--- /dev/null
+++ b/tests/Unit/Services/Scores/ScoreTermServiceTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\ScoreTermService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class ScoreTermServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_semester_and_school_year_fallback_to_configuration(): void
+    {
+        DB::table('configuration')->insert([
+            ['config_key' => 'semester', 'config_value' => 'Fall'],
+            ['config_key' => 'school_year', 'config_value' => '2025-2026'],
+        ]);
+
+        $service = new ScoreTermService();
+
+        $this->assertSame('Fall', $service->semesterLabel(null));
+        $this->assertSame('2025-2026', $service->schoolYear(null));
+    }
+
+    public function test_normalize_and_variants(): void
+    {
+        $service = new ScoreTermService();
+
+        $this->assertSame('fall', $service->normalizeSemester('Semester 1'));
+        $this->assertSame('spring', $service->normalizeSemester('2nd Semester'));
+
+        $variants = $service->semesterVariants('Fall');
+        $this->assertContains('First Semester', $variants);
+        $this->assertContains('Semester 1', $variants);
+    }
+}
diff --git a/tests/Unit/Services/Scores/SemesterScoreServiceTest.php b/tests/Unit/Services/Scores/SemesterScoreServiceTest.php
new file mode 100644
index 00000000..c699cf76
--- /dev/null
+++ b/tests/Unit/Services/Scores/SemesterScoreServiceTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Tests\Unit\Services\Scores;
+
+use App\Services\Scores\SemesterScoreService;
+use App\Services\Scores\AttendanceCalculator;
+use App\Services\Scores\HomeworkCalculator;
+use App\Services\Scores\ProjectCalculator;
+use App\Services\Scores\QuizCalculator;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class SemesterScoreServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_update_student_scores_upserts_semester_scores(): void
+    {
+        DB::table('midterm_exam')->insert([
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 4,
+            'updated_by' => 99,
+            'score' => 88,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = new SemesterScoreService(
+            new FakeAttendanceCalculator(),
+            new FakeHomeworkCalculator(),
+            new FakeQuizCalculator(),
+            new FakeProjectCalculator()
+        );
+
+        $service->updateStudentScores([
+            'student_id' => 1,
+            'school_id' => 'SCH1',
+            'class_section_id' => 4,
+            'updated_by' => 99,
+        ], 'Fall', '2025-2026');
+
+        $row = DB::table('semester_scores')->where([
+            'student_id' => 1,
+            'class_section_id' => 4,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ])->first();
+
+        $this->assertNotNull($row);
+        $this->assertSame(95.0, (float) $row->attendance_score);
+        $this->assertSame(80.0, (float) $row->homework_avg);
+        $this->assertSame(90.0, (float) $row->quiz_avg);
+        $this->assertSame(100.0, (float) $row->project_avg);
+        $this->assertSame(84.0, (float) $row->ptap_score);
+        $this->assertSame(88.0, (float) $row->midterm_exam_score);
+        $this->assertSame(88.6, (float) $row->semester_score);
+    }
+}
+
+class FakeAttendanceCalculator extends AttendanceCalculator
+{
+    public function __construct()
+    {
+    }
+
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        return ['attendance_score' => 95.0];
+    }
+}
+
+class FakeHomeworkCalculator extends HomeworkCalculator
+{
+    public function __construct()
+    {
+    }
+
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        return ['homework_avg' => 80.0];
+    }
+}
+
+class FakeQuizCalculator extends QuizCalculator
+{
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        return ['quiz_avg' => 90.0];
+    }
+}
+
+class FakeProjectCalculator extends ProjectCalculator
+{
+    public function __construct()
+    {
+    }
+
+    public function calculate(int $studentId, string $semester, string $schoolYear, ?int $classSectionId = null): array
+    {
+        return [
+            'project_avg' => 100.0,
+            'participation_score' => 70.0,
+        ];
+    }
+}
diff --git a/tests/Unit/Services/Semesters/SemesterConfigServiceTest.php b/tests/Unit/Services/Semesters/SemesterConfigServiceTest.php
new file mode 100644
index 00000000..9f1976e5
--- /dev/null
+++ b/tests/Unit/Services/Semesters/SemesterConfigServiceTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Unit\Services\Semesters;
+
+use App\Services\Semesters\SemesterConfigService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class SemesterConfigServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_reads_dates_from_configuration(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'fall_semester_start', 'config_value' => '2025-09-01'],
+            ['id' => 2, 'config_key' => 'spring_semester_start', 'config_value' => '2026-01-20'],
+            ['id' => 3, 'config_key' => 'last_school_day', 'config_value' => '2026-06-01'],
+        ]);
+
+        $service = new SemesterConfigService();
+        $this->assertSame('2025-09-01', $service->getFallStart()?->format('Y-m-d'));
+        $this->assertSame('2026-01-20', $service->getSpringStart()?->format('Y-m-d'));
+        $this->assertSame('2026-06-01', $service->getLastSchoolDay()?->format('Y-m-d'));
+    }
+}
diff --git a/tests/Unit/Services/Semesters/SemesterRangeServiceTest.php b/tests/Unit/Services/Semesters/SemesterRangeServiceTest.php
new file mode 100644
index 00000000..58400bff
--- /dev/null
+++ b/tests/Unit/Services/Semesters/SemesterRangeServiceTest.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Tests\Unit\Services\Semesters;
+
+use App\Services\SemesterRangeService;
+use App\Services\Semesters\SemesterConfigService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class SemesterRangeServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_get_school_year_range_falls_back_when_config_missing(): void
+    {
+        $service = new SemesterRangeService(new SemesterConfigService());
+        [$start, $end] = $service->getSchoolYearRange('2025-2026');
+
+        $this->assertSame('2025-09-01', $start);
+        $this->assertSame('2026-06-30', $end);
+    }
+
+    public function test_get_semester_for_date_uses_config_dates(): void
+    {
+        DB::table('configuration')->insert([
+            ['id' => 1, 'config_key' => 'fall_semester_start', 'config_value' => '2025-09-01'],
+            ['id' => 2, 'config_key' => 'spring_semester_start', 'config_value' => '2026-01-20'],
+            ['id' => 3, 'config_key' => 'last_school_day', 'config_value' => '2026-06-01'],
+        ]);
+
+        $service = new SemesterRangeService(new SemesterConfigService());
+        $semester = $service->getSemesterForDate('2025-10-01');
+
+        $this->assertSame('Fall', $semester);
+    }
+
+    public function test_normalize_semester(): void
+    {
+        $service = new SemesterRangeService(new SemesterConfigService());
+
+        $this->assertSame('Fall', $service->normalizeSemester('fall'));
+        $this->assertSame('Spring', $service->normalizeSemester('SPRING'));
+        $this->assertSame('', $service->normalizeSemester('winter'));
+    }
+}
diff --git a/tests/Unit/Services/Users/LoginActivityServiceTest.php b/tests/Unit/Services/Users/LoginActivityServiceTest.php
new file mode 100644
index 00000000..12f899a5
--- /dev/null
+++ b/tests/Unit/Services/Users/LoginActivityServiceTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Tests\Unit\Services\Users;
+
+use App\Services\Users\LoginActivityService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class LoginActivityServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_returns_paginated_payload(): void
+    {
+        DB::table('login_activity')->insert([
+            'user_id' => 1,
+            'email' => 'user@example.com',
+            'login_time' => '2025-01-02 09:00:00',
+            'logout_time' => null,
+            'ip_address' => '10.0.0.1',
+            'user_agent' => 'TestAgent',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('login_activity')->insert([
+            'user_id' => 1,
+            'email' => 'user@example.com',
+            'login_time' => '2025-01-01 09:00:00',
+            'logout_time' => null,
+            'ip_address' => '10.0.0.2',
+            'user_agent' => 'TestAgent',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = app(LoginActivityService::class);
+        $payload = $service->list(1, 2);
+
+        $this->assertSame(2, $payload['pagination']['total']);
+        $this->assertSame(2, $payload['pagination']['currentPage']);
+        $this->assertSame('10.0.0.2', $payload['activities'][0]['ip_address']);
+    }
+}
diff --git a/tests/Unit/Services/Users/UserEventServiceTest.php b/tests/Unit/Services/Users/UserEventServiceTest.php
new file mode 100644
index 00000000..abb925b8
--- /dev/null
+++ b/tests/Unit/Services/Users/UserEventServiceTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Unit\Services\Users;
+
+use App\Services\EmailService;
+use App\Services\Users\UserEventService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Mockery;
+use Tests\TestCase;
+
+class UserEventServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_handle_new_account_sends_email(): void
+    {
+        $emailService = Mockery::mock(EmailService::class);
+        $emailService->shouldReceive('send')
+            ->once()
+            ->with(
+                'user@example.com',
+                'Welcome to Al Rahma Sunday School!',
+                Mockery::type('string'),
+                'registration'
+            )
+            ->andReturn(true);
+
+        $service = new UserEventService($emailService);
+
+        $result = $service->handleNewAccountAdded([
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'email' => 'user@example.com',
+        ]);
+
+        $this->assertTrue($result);
+    }
+
+    public function test_handle_new_account_requires_email(): void
+    {
+        $emailService = Mockery::mock(EmailService::class);
+        $emailService->shouldNotReceive('send');
+
+        $service = new UserEventService($emailService);
+        $result = $service->handleNewAccountAdded([
+            'firstname' => 'Test',
+            'lastname' => 'User',
+        ]);
+
+        $this->assertFalse($result);
+    }
+}
diff --git a/tests/Unit/Services/Users/UserListServiceTest.php b/tests/Unit/Services/Users/UserListServiceTest.php
new file mode 100644
index 00000000..565d7a42
--- /dev/null
+++ b/tests/Unit/Services/Users/UserListServiceTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Tests\Unit\Services\Users;
+
+use App\Models\User;
+use App\Services\Users\UserListService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Tests\TestCase;
+
+class UserListServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_list_includes_roles_and_second_parent_flag(): void
+    {
+        DB::table('roles')->insert([
+            'id' => 5,
+            'name' => 'Parent',
+            'slug' => 'parent',
+            'description' => 'Parent role',
+            'dashboard_route' => 'parent/dashboard',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Jane',
+            'lastname' => 'Doe',
+            'cellphone' => '5551112222',
+            'email' => 'second.parent@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 5,
+        ]);
+
+        DB::table('parents')->insert([
+            'secondparent_firstname' => 'Jane',
+            'secondparent_lastname' => 'Doe',
+            'secondparent_gender' => 'Female',
+            'secondparent_email' => 'second.parent@example.com',
+            'secondparent_phone' => '5551112222',
+            'firstparent_id' => 10,
+            'secondparent_id' => 11,
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $service = app(UserListService::class);
+        $rows = $service->list('id', 'asc');
+
+        $this->assertCount(1, $rows);
+        $this->assertSame('second.parent@example.com', $rows[0]['user']['email']);
+        $this->assertSame(['Parent'], $rows[0]['roles']);
+        $this->assertSame('Yes', $rows[0]['second_from_parents']);
+    }
+}
diff --git a/tests/Unit/Services/Users/UserManagementServiceTest.php b/tests/Unit/Services/Users/UserManagementServiceTest.php
new file mode 100644
index 00000000..a8eb0782
--- /dev/null
+++ b/tests/Unit/Services/Users/UserManagementServiceTest.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Tests\Unit\Services\Users;
+
+use App\Models\User;
+use App\Services\Users\UserEventService;
+use App\Services\Users\UserManagementService;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\DB;
+use Mockery;
+use Tests\TestCase;
+
+class UserManagementServiceTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_create_persists_user_and_role_and_sends_welcome(): void
+    {
+        DB::table('roles')->insert([
+            'id' => 1,
+            'name' => 'Parent',
+            'slug' => 'parent',
+            'description' => 'Parent role',
+            'dashboard_route' => 'parent/dashboard',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        $eventService = Mockery::mock(UserEventService::class);
+        $eventService->shouldReceive('handleNewAccountAdded')
+            ->once()
+            ->andReturn(true);
+
+        $service = new UserManagementService($eventService);
+
+        $result = $service->create([
+            'firstname' => 'New',
+            'lastname' => 'User',
+            'cellphone' => '5554443333',
+            'email' => 'new.user@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => true,
+            'role_id' => 1,
+            'password' => 'secret123',
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $this->assertTrue($result['ok']);
+        $this->assertInstanceOf(User::class, $result['user']);
+        $this->assertDatabaseHas('users', [
+            'email' => 'new.user@example.com',
+            'firstname' => 'New',
+            'lastname' => 'User',
+        ]);
+        $this->assertDatabaseHas('user_roles', [
+            'user_id' => $result['user']->id,
+            'role_id' => 1,
+        ]);
+    }
+
+    public function test_update_changes_user_fields(): void
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'test@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        $eventService = Mockery::mock(UserEventService::class);
+        $service = new UserManagementService($eventService);
+
+        $result = $service->update(1, [
+            'firstname' => 'Updated',
+            'email' => 'updated@example.com',
+            'accept_school_policy' => false,
+        ]);
+
+        $this->assertTrue($result['ok']);
+        $this->assertDatabaseHas('users', [
+            'id' => 1,
+            'firstname' => 'Updated',
+            'email' => 'updated@example.com',
+            'accept_school_policy' => 0,
+        ]);
+    }
+
+    public function test_delete_removes_user_and_roles(): void
+    {
+        DB::table('users')->insert([
+            'id' => 1,
+            'school_id' => 1,
+            'firstname' => 'Test',
+            'lastname' => 'User',
+            'cellphone' => '5555555555',
+            'email' => 'test@example.com',
+            'address_street' => '123 Main',
+            'city' => 'City',
+            'state' => 'ST',
+            'zip' => '12345',
+            'accept_school_policy' => 1,
+            'is_verified' => 1,
+            'status' => 'Active',
+            'is_suspended' => 0,
+            'failed_attempts' => 0,
+            'password' => bcrypt('secret'),
+            'semester' => 'Fall',
+            'school_year' => '2025-2026',
+        ]);
+
+        DB::table('roles')->insert([
+            'id' => 1,
+            'name' => 'Parent',
+            'slug' => 'parent',
+            'description' => 'Parent role',
+            'dashboard_route' => 'parent/dashboard',
+            'priority' => 1,
+            'is_active' => 1,
+        ]);
+
+        DB::table('user_roles')->insert([
+            'user_id' => 1,
+            'role_id' => 1,
+        ]);
+
+        $eventService = Mockery::mock(UserEventService::class);
+        $service = new UserManagementService($eventService);
+
+        $result = $service->delete(1);
+
+        $this->assertTrue($result['ok']);
+        $this->assertDatabaseMissing('users', ['id' => 1]);
+        $this->assertDatabaseMissing('user_roles', ['user_id' => 1]);
+    }
+}