Update: 2026-07-14 00:34:22

backend/transit/driver/activate.php

@@ -1,41 +0,0 @@
-<?php
-// transit/driver/activate.php — السائق يفعّل حسابه (بدون JWT — قبل الدخول)
-// POST: invite_token, phone, otp
-
-require_once __DIR__ . '/../../core/bootstrap.php';
-require_once __DIR__ . '/../functions.php';
-require_once __DIR__ . '/../../core/Services/OtpService.php';
-
-try { $transit_con = Database::get('transit'); }
-catch (Exception $e) { jsonError('Transit service unavailable', 503); }
-
-requireTransitFields(['invite_token','phone','otp']);
-$inviteToken = filterRequest('invite_token');
-$phone       = normalizePhone(filterRequest('phone'));
-$otp         = preg_replace('/\D/', '', filterRequest('otp'));
-
-if (!transitVerifyAdminOtp($phone, $otp)) jsonError('Invalid or expired OTP', 401);
-
-$phoneEnc = $encryptionHelper->encryptData($phone);
-
-$st = $transit_con->prepare(
-    "SELECT id, org_id, name, status FROM transit_drivers
-     WHERE invite_token=? AND phone=? LIMIT 1"
-);
-$st->execute([$inviteToken, $phoneEnc]);
-$driver = $st->fetch();
-
-if (!$driver)           jsonError('Invalid invite token or phone mismatch', 404);
-if ($driver['status'] === 'active')    jsonError('Driver already activated', 409);
-if ($driver['status'] === 'suspended') jsonError('Account suspended', 403);
-
-$transit_con->prepare(
-    "UPDATE transit_drivers SET status='active', activated_at=NOW(), invite_token=NULL WHERE id=?"
-)->execute([$driver['id']]);
-
-jsonSuccess([
-    'driver_id' => (int)$driver['id'],
-    'org_id'    => (int)$driver['org_id'],
-    'name'      => $driver['name'],
-    'mode'      => 'bus',
-], 'Driver activated. Welcome to مواصلاتي!');

backend/transit/driver/activate_by_app.php

@@ -51,6 +51,9 @@ $transit_con->prepare(
      WHERE id=?"
 )->execute([(string)$transit_user_id, $driver['id']]);
 
+// إبطال أي كاش قديم لهذا الحساب (قد يكون كُوش كـ null سابقاً أو بحالة أخرى)
+transitInvalidateDriverCache((string)$transit_user_id);
+
 appLog("[TRANSIT][DRIVER] activated driver #{$driver['id']} (org#{$driver['org_id']}) linked to main_driver_id={$transit_user_id}", 'INFO');
 
 jsonSuccess([

backend/transit/driver/suspend.php

@@ -9,7 +9,7 @@ $action   = filterRequest('action');
 if (!$driverId) jsonError('driver_id is required', 400);
 if (!in_array($action, ['suspend', 'activate'])) jsonError('action must be suspend or activate', 400);
 
-$chk = $transit_con->prepare("SELECT id, status FROM transit_drivers WHERE id=? AND org_id=? LIMIT 1");
+$chk = $transit_con->prepare("SELECT id, status, main_driver_id FROM transit_drivers WHERE id=? AND org_id=? LIMIT 1");
 $chk->execute([$driverId, $transit_org_id]);
 $driver = $chk->fetch();
 if (!$driver) jsonError('Driver not found or access denied', 404);
@@ -22,6 +22,11 @@ if ($action === 'activate' && $driver['status'] !== 'suspended') {
 $newStatus = $action === 'suspend' ? 'suspended' : 'active';
 $transit_con->prepare("UPDATE transit_drivers SET status=? WHERE id=?")->execute([$newStatus, $driverId]);
 
+// إبطال كاش السائق فوراً — عند التعليق يجب أن تُرفض رحلاته في الطلب التالي مباشرة
+if (!empty($driver['main_driver_id'])) {
+    transitInvalidateDriverCache((string)$driver['main_driver_id']);
+}
+
 appLog("[TRANSIT][DRIVER][suspend] driver #{$driverId} org#{$transit_org_id} → {$newStatus}");
 
 jsonSuccess(['driver_id' => $driverId, 'status' => $newStatus]);