Update: 2026-07-23 20:15:22

2026-07-23 20:15:22 +03:00
parent c35b350b31
commit 12a1cbc98c
2 changed files with 10 additions and 4 deletions
@@ -21,10 +21,11 @@ try {
        FROM ride
        WHERE passenger_id = ? 
        AND (
-            status IN ('Apply', 'Applied', 'accepted', 'arrived', 'Arrived', 'Begin') AND created_at >= NOW() - INTERVAL 1 HOUR
-            OR (status = 'Finished' AND created_at >= NOW() - INTERVAL 1 HOUR)
+            status IN ('waiting', 'wait', 'Apply', 'Applied', 'accepted', 'arrived', 'Arrived', 'Begin') 
+            AND TIMESTAMP(date, time) >= NOW() - INTERVAL 1 HOUR
+            OR (status = 'Finished' AND updated_at >= NOW() - INTERVAL 1 HOUR)
        )
-        ORDER BY created_at DESC 
+        ORDER BY TIMESTAMP(date, time) DESC 
        LIMIT 1
    ");