The ride table holds two generations of status values: the legacy CamelCase
set ('Finished', 'CancelFromPassenger') and the lowercase set written by
backend/ride/rides/* today ('completed', 'cancelled_by_passenger'). Admin
queries only matched the legacy set, so on live data:
- get_rides_by_status.php returned nothing meaningful for every filter, and
the "in progress" default masked it.
- dashbord.php reported total_driver_earnings as NULL, completed_rides as a
fraction of the real count, and cancelled_rides as 0.
- driver_avg_duration averaged in negative durations, yielding "-00h 22m".
All three now match on LOWER(status) across both families.
Staff/pending.php ran with no authentication at all, exposing pending
admins' names and phone numbers to any caller; it now goes through
connect.php with a role check. It also returned HTTP 400 for everything when
the `users` table was absent — each source is queried independently and
reports its own availability.
Console:
- Render rides from either schema generation (price/date/time and
start_location coordinates, or the older address/created_at columns).
- Null aggregates render as "—" rather than a measured 0.00.
- Add tariff/promo, WhatsApp send and encryption modules, all super-admin
gated; pricing remains read-only.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
118 lines
5.2 KiB
PHP
118 lines
5.2 KiB
PHP
<?php
|
|
require_once __DIR__ . '/../../connect.php';
|
|
|
|
header("Access-Control-Allow-Origin: https://siromove.com");
|
|
header('Content-Type: application/json; charset=utf-8');
|
|
|
|
try {
|
|
$statusFilter = filterRequest("status");
|
|
// القيم المتوقعة من التطبيق: 'All', 'Begin', 'New', 'Completed', 'Canceled'
|
|
if (!$statusFilter) $statusFilter = "Begin";
|
|
|
|
$params = [];
|
|
$whereClause = "";
|
|
|
|
// --- منطق ترجمة الحالات (Mapping Logic) - مصحح ليطابق حالات DB الفعلية ---
|
|
switch ($statusFilter) {
|
|
case 'All':
|
|
$whereClause = ""; // لا يوجد شرط، اجلب الكل
|
|
break;
|
|
|
|
// ملاحظة: قاعدة البيانات تحتوي عائلتين من الحالات — القديمة بصيغة
|
|
// CamelCase ('Finished','Begin','CancelFromPassenger') والجديدة التي
|
|
// يكتبها خط الرحلات الحالي بأحرف صغيرة ('completed','accepted',
|
|
// 'cancelled_by_passenger'). المقارنة تتم بـ LOWER() لتغطية الاثنتين.
|
|
case 'Pending':
|
|
// الرحلات المعلقة/الجديدة: بانتظار سائق
|
|
$whereClause = "WHERE LOWER(r.status) IN ('new','nothing','waiting','wait','pending','searching')";
|
|
break;
|
|
|
|
case 'Begin':
|
|
// الرحلات الجارية: من قبول السائق إلى بدء التشغيل
|
|
$whereClause = "WHERE LOWER(r.status) IN ('apply','applied','arrived','begin','accepted','started','claimed')";
|
|
break;
|
|
|
|
case 'Completed':
|
|
// الرحلات المكتملة
|
|
$whereClause = "WHERE LOWER(r.status) IN ('finished','completed')";
|
|
break;
|
|
|
|
case 'Canceled':
|
|
// جميع أنواع الإلغاء
|
|
$whereClause = "WHERE LOWER(r.status) IN (
|
|
'cancel','cancelfromdriver','cancelfromdriverafterapply','cancelfrompassenger',
|
|
'timeout','refused','cancelled_by_passenger','cancelled_by_driver',
|
|
'cancelled_no_driver_found'
|
|
)";
|
|
break;
|
|
|
|
default:
|
|
// في حال تم إرسال حالة محددة غير المذكورين
|
|
$whereClause = "WHERE LOWER(r.status) = LOWER(?)";
|
|
$params[] = $statusFilter;
|
|
break;
|
|
}
|
|
|
|
// --- الاستعلام ---
|
|
$sql = "
|
|
SELECT
|
|
r.*,
|
|
-- بيانات السائق
|
|
d.first_name as d_fname, d.last_name as d_lname, d.phone as d_phone, d.id as driver_real_id,
|
|
-- إحصائيات السائق (نحسب المكتمل والملغي بشكل أدق)
|
|
(SELECT COUNT(*) FROM ride WHERE driver_id = d.id AND status = 'Finished') as d_completed,
|
|
(SELECT COUNT(*) FROM ride WHERE driver_id = d.id AND status LIKE 'Cancel%') as d_canceled,
|
|
|
|
-- بيانات الراكب
|
|
p.first_name as p_fname, p.last_name as p_lname, p.phone as p_phone,
|
|
-- إحصائيات الراكب
|
|
(SELECT COUNT(*) FROM ride WHERE passenger_id = p.id AND status = 'Finished') as p_completed,
|
|
|
|
-- سبب الإلغاء
|
|
-- نحاول جلبه من جدول driver_orders (ملاحظات السائق)
|
|
-- نستخدم COALESCE لجلب 'لا يوجد سبب' إذا كانت القيمة فارغة
|
|
COALESCE(
|
|
(SELECT notes FROM driver_orders WHERE order_id = r.id LIMIT 1),
|
|
'لا يوجد سبب مسجل'
|
|
) as cancel_reason
|
|
|
|
FROM ride r
|
|
LEFT JOIN driver d ON r.driver_id = d.id
|
|
LEFT JOIN passengers p ON r.passenger_id = p.id
|
|
$whereClause
|
|
ORDER BY r.id DESC
|
|
LIMIT 100
|
|
";
|
|
|
|
$stmt = $con->prepare($sql);
|
|
$stmt->execute($params);
|
|
$rides = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
|
|
|
$data = [];
|
|
|
|
foreach ($rides as $row) {
|
|
// فك التشفير
|
|
try { $row['d_fname'] = $encryptionHelper->decryptData($row['d_fname']); } catch(Exception $e){}
|
|
try { $row['d_lname'] = $encryptionHelper->decryptData($row['d_lname']); } catch(Exception $e){}
|
|
try { $row['d_phone'] = $encryptionHelper->decryptData($row['d_phone']); } catch(Exception $e){}
|
|
|
|
try { $row['p_fname'] = $encryptionHelper->decryptData($row['p_fname']); } catch(Exception $e){}
|
|
try { $row['p_lname'] = $encryptionHelper->decryptData($row['p_lname']); } catch(Exception $e){}
|
|
try { $row['p_phone'] = $encryptionHelper->decryptData($row['p_phone']); } catch(Exception $e){}
|
|
|
|
$row['driver_full_name'] = trim($row['d_fname'] . ' ' . $row['d_lname']);
|
|
$row['passenger_full_name'] = trim($row['p_fname'] . ' ' . $row['p_lname']);
|
|
|
|
if(empty($row['driver_full_name'])) $row['driver_full_name'] = "Unknown Driver";
|
|
if(empty($row['passenger_full_name'])) $row['passenger_full_name'] = "Unknown Passenger";
|
|
|
|
$data[] = $row;
|
|
}
|
|
|
|
jsonSuccess($data);
|
|
|
|
} catch (PDOException $e) {
|
|
error_log("[get_rides_by_status.php] " . $e->getMessage());
|
|
jsonError("An internal error occurred. Please try again later.");
|
|
}
|
|
?>
|