fix all issues before deploy

2026-08-25 03:10:44 -04:00
parent 5f5afe97ad
commit 9899af7b37
11 changed files with 515 additions and 37 deletions
@@ -2897,12 +2897,17 @@ class ParentController extends BaseController
        $lnKey = mb_strtolower(trim(preg_replace('/\s+/', ' ', $lastName)), 'UTF-8');
        $dobStr = $dobObj->format('Y-m-d');

-$existing = $this->studentModel
-    ->where('school_year', $schoolYear)
-    ->where('dob', $dobStr)
-    ->where('firstname', $firstName)   // already normalized above
-    ->where('lastname',  $lastName)    // already normalized above
-    ->first();
+        $existingBuilder = $this->studentModel
+            ->where('parent_id', (int) $parentId)
+            ->where('dob', $dobStr)
+            ->where('firstname', $firstName)   // already normalized above
+            ->where('lastname',  $lastName);   // already normalized above
+
+        if ($this->db->fieldExists('school_year', 'students')) {
+            $existingBuilder->where('school_year', $schoolYear);
+        }
+
+        $existing = $existingBuilder->first();

        if (!$studentId && $existing) {
            session()->setFlashdata(