Update: 2026-06-25 18:39:01

backend/serviceapp/getDriverDetailsForActivate.php

@@ -5,7 +5,7 @@ $driverId = filterRequest("driverId");
 
 $sql = "SELECT d.*, cr.* 
         FROM `driver` d 
-        JOIN `CarRegistration` cr ON cr.driverID = d.id 
+        LEFT JOIN `CarRegistration` cr ON cr.driverID = d.id 
         WHERE d.id = :driverId ";
 
 $stmt = $con->prepare($sql);

backend/serviceapp/getDriverNotCompleteRegistration.php

@@ -7,14 +7,14 @@ $sql = "SELECT
     notesForDriverService.note
 FROM 
     phone_verification
-INNER JOIN -- نستخدم INNER JOIN لضمان جلب من لديهم ملاحظات فقط
+INNER JOIN
     `notesForDriverService` 
 ON 
     `notesForDriverService`.`phone` = `phone_verification`.`phone_number`
 WHERE 
     `notesForDriverService`.`note` != 'delete'
 ORDER BY 
-    `phone_verification`.`created_at` DESC -- الترتيب حسب تاريخ التحقق لأنه العمود الموجود
+    `phone_verification`.`created_at` DESC
 LIMIT 400;
 ";
 
@@ -24,7 +24,6 @@ $stmt->execute();
 if ($stmt->rowCount() > 0) {
     $rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-    // فك تشفير أرقام الهواتف فقط للإخراج
    foreach ($rows as &$row) {
         if (!empty($row['phone'])) {
             $row['phone'] = $encryptionHelper->decryptData($row['phone']);
@@ -42,4 +41,3 @@ if ($stmt->rowCount() > 0) {
 } else {
     jsonError("No Phone verified yet found");
 }
-?>

backend/serviceapp/login.php

@@ -105,10 +105,6 @@ try {
                 $expires_in = $ttl;
             }
 
-            // توليد مفتاح HMAC فريد للمستخدم (للتوافق مع CRUD الجديد)
-            $hmacKey = hash_hmac('sha256', (string)$user['id'], getenv('SECRET_KEY_HMAC'));
-
-                // ✅ FIX H-05: لا نعيد مفتاح HMAC أبداً (يُحسب على العميل بنفس المعادلة)
             printSuccess([
                 "message" => "Login successful",
                 "data" => $user,