fix school year and enrollment steps

app/Services/EnrollmentRegistrationEmailService.php

@@ -8,7 +8,7 @@ use DateTimeInterface;
 
 final class EnrollmentRegistrationEmailService
 {
-    public const TEMPLATE_VERSION = 'phase5_consolidated_v1';
+    public const TEMPLATE_VERSION = 'phase5_consolidated_v2';
 
     public function __construct(
         private readonly BaseConnection $db,
@@ -149,7 +149,7 @@ final class EnrollmentRegistrationEmailService
         $previousYear = $this->previousSchoolYearName($schoolYearName);
         $deadline = $this->dateText($schoolYear['registration_deadline_at'] ?? $schoolYear['registration_ends_on'] ?? null);
         $opens = $this->dateText($schoolYear['registration_opens_at'] ?? $schoolYear['registration_starts_on'] ?? null);
-        $students = [];
+        $studentRows = [];
         $studentIds = [];
 
         foreach ($family['students'] as $student) {
@@ -159,20 +159,19 @@ final class EnrollmentRegistrationEmailService
             }
 
             $evaluation = $this->transitionService->evaluate($studentId, $previousYear, $schoolYearName, 'parent');
-            $students[] = $this->studentSection($student, $evaluation, $opens, $deadline);
+            $studentRows[] = $this->studentRow($student, $evaluation, $opens, $deadline);
             $studentIds[] = $studentId;
         }
 
         $financial = $this->financialSection((int) $family['parent_user_id'], $schoolYear, $previousYear);
         $subject = 'Registration for ' . $schoolYearName . ' Is Now Open';
         $bodyHtml = '<p>Dear ' . esc($family['name']) . ',</p>'
-            . '<p>We are pleased to welcome your family to the registration process for the ' . esc($schoolYearName) . ' school year.</p>'
-            . '<p>Registration opens on ' . esc($opens) . ' and closes on ' . esc($deadline) . '.</p>'
-            . '<p>Please review the information below for each of your children, including the deliberation decision, registration eligibility, expected academic placement, and any required action.</p>'
-            . implode('', $students)
+            . '<p>Registration for the ' . esc($schoolYearName) . ' school year is now open. Please review the student summary below and complete the portal steps before ' . esc($deadline) . '.</p>'
+            . $this->studentsTable($studentRows)
             . $financial
-            . '<p>To complete registration for each eligible student:</p>'
-            . '<ol><li>Sign in to the parent portal.</li><li>Review and update student information.</li><li>Upload required documents.</li><li>Review and acknowledge school policies.</li><li>Review tuition, fees, and any carry-over balance.</li><li>Submit registration before ' . esc($deadline) . '.</li></ol>'
+            . '<h3>Registration Steps</h3>'
+            . '<p>Re-enrollment opens on ' . esc($opens) . ' and closes on ' . esc($deadline) . '. Complete re-enrollment for each eligible student before the deadline to secure their enrollment for the upcoming school year.</p>'
+            . '<ol><li>Sign in to the parent portal.</li><li>Review student information and upload any required documents.</li><li>Acknowledge school policies.</li><li>Review tuition, fees, and any carry-over balance.</li><li>Submit Enrollment.</li></ol>'
             . '<p>Registration portal: <a href="' . esc(site_url('parent/enroll_classes')) . '">' . esc(site_url('parent/enroll_classes')) . '</a></p>'
             . '<p>For assistance, please contact the school administration.</p>'
             . '<p>Sincerely,<br>Al Rahma Sunday School<br>School Administration</p>';
@@ -190,7 +189,19 @@ final class EnrollmentRegistrationEmailService
         ];
     }
 
-    private function studentSection(array $student, array $evaluation, string $opens, string $deadline): string
+    private function studentsTable(array $studentRows): string
+    {
+        if ($studentRows === []) {
+            return '<p>No eligible linked students were found for this email.</p>';
+        }
+
+        return '<table style="width:100%; border-collapse:collapse; margin:12px 0 18px; font-size:14px;">'
+            . '<tbody>'
+            . implode('', $studentRows)
+            . '</tbody></table>';
+    }
+
+    private function studentRow(array $student, array $evaluation, string $opens, string $deadline): string
     {
         $name = trim((string) ($student['firstname'] ?? '') . ' ' . (string) ($student['lastname'] ?? '')) ?: 'Student';
         $decision = DeliberationDecision::display((string) ($evaluation['deliberation_decision'] ?? ''));
@@ -199,12 +210,12 @@ final class EnrollmentRegistrationEmailService
         $requiredAction = $this->requiredAction($evaluation, $deadline);
         $message = $this->decisionMessage($name, $evaluation, $opens, $deadline);
 
-        return '<h3>' . esc($name) . '</h3>'
-            . '<p><strong>Deliberation decision:</strong> ' . esc($decision ?: 'Pending') . '<br>'
-            . '<strong>Registration status:</strong> ' . esc($status) . '<br>'
-            . '<strong>Expected placement:</strong> ' . esc($placement) . '</p>'
-            . '<p>' . esc($message) . '</p>'
-            . '<p><strong>Required action:</strong> ' . esc($requiredAction) . '</p>';
+        return '<tr>'
+            . '<td style="border:1px solid #ddd; padding:8px; vertical-align:top;">' . esc($name) . '</td>'
+            . '<td style="border:1px solid #ddd; padding:8px; vertical-align:top;">' . esc($decision ?: 'Pending') . '</td>'
+            . '<td style="border:1px solid #ddd; padding:8px; vertical-align:top;"><strong>' . esc($status) . '</strong><br>' . esc($placement) . '</td>'
+            . '<td style="border:1px solid #ddd; padding:8px; vertical-align:top;">' . esc($message) . '<br><strong>' . esc($requiredAction) . '</strong></td>'
+            . '</tr>';
     }
 
     private function decisionMessage(string $name, array $evaluation, string $opens, string $deadline): string
@@ -212,9 +223,7 @@ final class EnrollmentRegistrationEmailService
         if ((string) ($evaluation['deliberation_decision'] ?? '') === DeliberationDecision::PASSED) {
             $grade = $this->currentGradeText($evaluation);
 
-            return 'We are pleased to inform you that ' . $name . ' has successfully passed ' . $grade . '. '
-                . 'Re-enrollment for the new school year will open on ' . $opens . '. Please make sure to re-enroll your child before ' . $deadline . ' to secure their enrollment for the upcoming school year. '
-                . 'To complete the process, sign in to the parent portal, review the student’s information, submit the required documents, acknowledge the school policies, and complete any applicable payment steps.';
+            return $name . ' has successfully passed ' . $grade . '.';
         }
 
         if (($evaluation['blockers'] ?? []) !== []) {