Update: 2026-07-13 22:23:21

This commit is contained in:
Hamza-Ayed
2026-07-13 22:23:22 +03:00
parent fd3f4a365a
commit c6f48a1f91
45 changed files with 3533 additions and 36 deletions
+18 -1
View File
@@ -18,7 +18,9 @@ if (!$driverRec) jsonError('Driver not found or not active', 403);
$driverId = (int)$driverRec['id'];
$st = $transit_con->prepare(
"SELECT id, route_id, status FROM transit_trips WHERE id=? AND driver_id=? LIMIT 1"
"SELECT t.id, t.route_id, t.status, r.name_ar AS route_name, r.direction
FROM transit_trips t JOIN transit_routes r ON r.id = t.route_id
WHERE t.id=? AND t.driver_id=? LIMIT 1"
);
$st->execute([$tripId, $driverId]);
$trip = $st->fetch();
@@ -38,4 +40,19 @@ transitClearTripOwner($tripId);
global $redisLocation;
if ($redisLocation) $redisLocation->del("transit:trip:{$tripId}:pos");
// إشعار أولياء الأمور — وصول (ذهاب) أو عودة (إياب) حسب اتجاه الخط
$guardEvent = ($trip['direction'] === 'inbound') ? 'return' : 'arrive';
$guardTitle = ($guardEvent === 'return') ? 'عاد الباص 🏠' : 'وصل الباص 🎓';
$guardBody = ($guardEvent === 'return')
? 'وصل باص خط ' . $trip['route_name'] . ' إلى محطته الأخيرة.'
: 'وصل باص خط ' . $trip['route_name'] . ' إلى وجهته.';
$stGuardEnroll = $transit_con->prepare(
"SELECT id FROM transit_enrollments WHERE preferred_route_id=? AND status='active'"
);
$stGuardEnroll->execute([(int)$trip['route_id']]);
foreach ($stGuardEnroll->fetchAll(PDO::FETCH_COLUMN) as $enrollId) {
transitNotifyGuardians((int)$enrollId, $guardEvent, $guardTitle, $guardBody);
}
jsonSuccess(['trip_id' => $tripId, 'status' => 'completed'], 'Trip completed');