Upload 3 files

easypay/includes/ApiValidator.php

@@ -170,11 +170,13 @@ class ApiValidator
      */
     public function validateStudentExists($studentId)
     {
-        $sql = "SELECT id, student_code, 
-                       CONCAT(last_name, ' ', first_name, ' ', COALESCE(other_name, '')) AS full_name,
-                       admission_status
-                FROM tb_student_registrations
-                WHERE id = :student_id";
+        $sql = "SELECT sr.id, sr.student_code, 
+                       CONCAT(sr.last_name, ' ', sr.first_name, ' ', COALESCE(sr.other_name, '')) AS full_name,
+                       sr.admission_status,
+                       al.level_name
+                FROM tb_student_registrations sr
+                LEFT JOIN tb_academic_levels al ON sr.level_id = al.id
+                WHERE sr.id = :student_id";
 
         $stmt = $this->pdo->prepare($sql);
         $stmt->execute(['student_id' => $studentId]);

easypay/includes/ReceiptGenerator.php

@@ -62,8 +62,16 @@ class ReceiptGenerator
             }
         }
 
+        // School Name Logic
+        $schoolName = "ACE JUNIOR COLLEGE";
+        $levelName = isset($data['level_name']) ? strtoupper($data['level_name']) : '';
+        // Check for Senior classes (SSS 1, SSS 2, SSS 3, or Senior)
+        if (strpos($levelName, 'SSS') !== false || strpos($levelName, 'SENIOR') !== false) {
+            $schoolName = "ACE SENIOR COLLEGE";
+        }
+
         // Header
-        $this->centerText($image, 18, 50, "ACE JUNIOR COLLEGE", $black);
+        $this->centerText($image, 18, 50, $schoolName, $black);
         $this->centerText($image, 10, 75, "...education for excellence", $grey);
         $this->centerText($image, 10, 100, "1, Ebute - Igbogbo Road, Ipakodo, Ikorodu, Lagos, Nigeria", $black);
         $this->centerText($image, 10, 120, "Phone No(s): 08027449739, 08077275777", $black);
@@ -111,13 +119,26 @@ class ReceiptGenerator
 
         // Rows
         $currY = $tableY + 30;
+        $totalBilled = 0;
+        $totalPaidToDate = 0;
+        $totalBalance = 0;
+
         if (isset($data['allocations']) && is_array($data['allocations'])) {
             foreach ($data['allocations'] as $alloc) {
                 $desc = $alloc['description'];
-                $billed = number_format($alloc['amount_billed'] ?? 0, 2);
-                $paid = number_format($alloc['amount'] ?? 0, 2);
-                $paidToDate = number_format($alloc['total_paid_to_date'] ?? 0, 2);
-                $balance = number_format($alloc['balance'] ?? 0, 2);
+                $billedVal = $alloc['amount_billed'] ?? 0;
+                $paidVal = $alloc['amount'] ?? 0;
+                $paidToDateVal = $alloc['total_paid_to_date'] ?? 0;
+                $balanceVal = $alloc['balance'] ?? 0;
+
+                $totalBilled += $billedVal;
+                $totalPaidToDate += $paidToDateVal;
+                $totalBalance += $balanceVal;
+
+                $billed = number_format($billedVal, 2);
+                $paid = number_format($paidVal, 2);
+                $paidToDate = number_format($paidToDateVal, 2);
+                $balance = number_format($balanceVal, 2);
 
                 $currY += 30;
 
@@ -140,9 +161,15 @@ class ReceiptGenerator
         $currY += 30;
 
         $totalPaid = number_format($data['total_paid'] ?? 0, 2);
+        $totalBilledStr = number_format($totalBilled, 2);
+        $totalPaidToDateStr = number_format($totalPaidToDate, 2);
+        $totalBalanceStr = number_format($totalBalance, 2);
 
-        // Show total under Amount Paid column
+        // Show all totals
+        $this->rightAlignText($image, 10, $cols[2] - 20, $currY, $totalBilledStr, $grey);
         $this->rightAlignText($image, 10, $cols[3] - 20, $currY, $totalPaid, $grey);
+        $this->rightAlignText($image, 10, $cols[4] - 20, $currY, $totalPaidToDateStr, $grey);
+        $this->rightAlignText($image, 10, $width - 40, $currY, $totalBalanceStr, $grey);
 
         imageline($image, 40, $currY + 10, $width - 40, $currY + 10, $black);