From f22d9f6c74fe234f2a49ef7f2526b8cabe2e4e90 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Mon, 11 May 2026 18:19:32 +0300
Subject: [PATCH] add new featurs like realtime 2026-5-11-2

---
 Admin/v2/analytics/driver_ranking.php |  2 +-
 Admin/v2/analytics/revenue.php        | 10 ++++-----
 serviceapp/getComplaintAllData.php    | 30 +++++++++++++--------------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Admin/v2/analytics/driver_ranking.php b/Admin/v2/analytics/driver_ranking.php
index ae5447c..5e8491f 100644
--- a/Admin/v2/analytics/driver_ranking.php
+++ b/Admin/v2/analytics/driver_ranking.php
@@ -14,7 +14,7 @@ try {
         SELECT 
             d.id, d.first_name, d.last_name, d.phone,
             COUNT(r.id) as completed_rides,
-            SUM(r.price_for_passenger) as total_revenue
+            SUM(r.price) as total_revenue
         FROM driver d
         JOIN ride r ON d.id = r.driver_id
         WHERE r.status = 'Finished'
diff --git a/Admin/v2/analytics/revenue.php b/Admin/v2/analytics/revenue.php
index a6d8ed7..f97a3ad 100644
--- a/Admin/v2/analytics/revenue.php
+++ b/Admin/v2/analytics/revenue.php
@@ -13,8 +13,8 @@ try {
     $stmt = $con->prepare("
         SELECT 
             DATE(created_at) as date,
-            SUM(price_for_passenger) as total_revenue,
-            SUM(price_for_passenger - price_for_driver) as company_profit,
+            SUM(price) as total_revenue,
+            SUM(price - price_for_driver) as company_profit,
             COUNT(*) as total_rides
         FROM ride 
         WHERE status = 'Finished' 
@@ -28,9 +28,9 @@ try {
     // ملخص عام
     $stmt = $con->prepare("
         SELECT 
-            SUM(price_for_passenger) as total_revenue_all,
-            SUM(price_for_passenger - price_for_driver) as total_profit_all,
-            AVG(price_for_passenger) as avg_ride_price
+            SUM(price) as total_revenue_all,
+            SUM(price - price_for_driver) as total_profit_all,
+            AVG(price) as avg_ride_price
         FROM ride 
         WHERE status = 'Finished' 
           AND created_at >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
diff --git a/serviceapp/getComplaintAllData.php b/serviceapp/getComplaintAllData.php
index 6cdb2b3..3694c2b 100644
--- a/serviceapp/getComplaintAllData.php
+++ b/serviceapp/getComplaintAllData.php
@@ -28,7 +28,7 @@ $sql = "SELECT
     FROM
         ratingDriver rd
     WHERE
-        rd.driver_id = cm.driver_id
+        rd.driver_id = cm.driver_id COLLATE utf8mb4_general_ci
 ) AS avgRatingDriverFromPassengers,
 (
     SELECT
@@ -36,7 +36,7 @@ $sql = "SELECT
     FROM
         ratingDriver rd
     WHERE
-        rd.driver_id = cm.driver_id
+        rd.driver_id = cm.driver_id COLLATE utf8mb4_general_ci
 ) AS countratingDriverFromPassengers,
 (
     SELECT
@@ -44,7 +44,7 @@ $sql = "SELECT
     FROM
         ratingPassenger rp
     WHERE
-        rp.passenger_id = cm.passenger_id
+        rp.passenger_id = cm.passenger_id COLLATE utf8mb4_general_ci
 ) AS avgRatingPassengerFromDrivers,
 (
     SELECT
@@ -52,7 +52,7 @@ $sql = "SELECT
     FROM
         ratingPassenger rp
     WHERE
-        rp.passenger_id = cm.passenger_id
+        rp.passenger_id = cm.passenger_id COLLATE utf8mb4_general_ci
 ) AS countRatingPassengerFromDrivers,
 (
     SELECT
@@ -60,7 +60,7 @@ $sql = "SELECT
     FROM
         ride
     WHERE
-        ride.driver_id = cm.driver_id
+        ride.driver_id = cm.driver_id COLLATE utf8mb4_general_ci
 ) countDriverRide,
 (
     SELECT
@@ -68,7 +68,7 @@ $sql = "SELECT
     FROM
         ride
     WHERE
-        ride.passenger_id = cm.passenger_id
+        ride.passenger_id = cm.passenger_id COLLATE utf8mb4_general_ci
 ) countPassengerRide,
 (
     SELECT
@@ -84,7 +84,7 @@ $sql = "SELECT
             'TransferFrom',
             'payout',
             'TransferTo'
-        ) AND payments.`driverID` = cm.driver_id
+        ) AND payments.`driverID` = cm.driver_id COLLATE utf8mb4_general_ci
 ) AS driverVisa,
 (
     SELECT
@@ -100,7 +100,7 @@ $sql = "SELECT
             'TransferFrom',
             'payout',
             'TransferTo'
-        ) AND dw.`driverID` = cm.driver_id
+        ) AND dw.`driverID` = cm.driver_id COLLATE utf8mb4_general_ci
 ) AS driverWallet,
 (
     SELECT
@@ -109,7 +109,7 @@ $sql = "SELECT
     FROM
         passengerWallet pw
     WHERE
-        pw.passenger_id = cm.passenger_id
+        pw.passenger_id = cm.passenger_id COLLATE utf8mb4_general_ci
 ) AS passengerWallet,
 (
     SELECT
@@ -117,7 +117,7 @@ $sql = "SELECT
     FROM
         driverToken
     WHERE
-        driverToken.captain_id = cm.driver_id
+        driverToken.captain_id = cm.driver_id COLLATE utf8mb4_general_ci
 ) AS driverToken,
 (
     SELECT
@@ -125,7 +125,7 @@ $sql = "SELECT
     FROM
         tokens
     WHERE
-        tokens.passengerID = cm.passenger_id
+        tokens.passengerID = cm.passenger_id COLLATE utf8mb4_general_ci
 ) AS passengerToken,
 (
     SELECT
@@ -146,11 +146,11 @@ $sql = "SELECT
 FROM
     `complaint` cm
 LEFT JOIN passengers p ON
-    p.id = cm.`passenger_id`
+    p.id = cm.`passenger_id` COLLATE utf8mb4_general_ci
 LEFT JOIN driver d ON
-    d.id = cm.driver_id
-LEFT JOIN ride ON ride.id = cm.ride_id
-left join payments on payments.rideId=cm.ride_id";
+    d.id = cm.driver_id COLLATE utf8mb4_general_ci
+LEFT JOIN ride ON ride.id = cm.ride_id COLLATE utf8mb4_general_ci
+left join payments on payments.rideId = cm.ride_id COLLATE utf8mb4_general_ci";
 
 try {
     $stmt = $con->prepare($sql);