From afe1b1c425413f83cdd7c425feb87fd21b35d727 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Fri, 1 May 2026 02:49:04 +0300 Subject: [PATCH] admin 22 --- ride/promo/get.php | 2 +- serviceapp/getComplaintAllData.php | 51 ++++++++++++++++-------------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ride/promo/get.php b/ride/promo/get.php index 6d18edf..ab9f904 100644 --- a/ride/promo/get.php +++ b/ride/promo/get.php @@ -11,7 +11,7 @@ if (!empty($promo_code)) { $stmt = $con->prepare($sql); $stmt->bindParam(':promo_code', $promo_code, PDO::PARAM_STR); } else { - $sql = "SELECT `id`, `promo_code`, `amount`, `description`, `passengerID`, `validity_start_date`, `validity_end_date` FROM `promos` ORDER BY id DESC"; + $sql = "SELECT `id`, `promo_code`, `amount`, `description`, `passengerID`, `validity_start_date`, `validity_end_date` FROM `promos` WHERE `passengerID` IN ('all', 'none', '') ORDER BY id DESC"; $stmt = $con->prepare($sql); } diff --git a/serviceapp/getComplaintAllData.php b/serviceapp/getComplaintAllData.php index 14ff6af..6cdb2b3 100644 --- a/serviceapp/getComplaintAllData.php +++ b/serviceapp/getComplaintAllData.php @@ -152,33 +152,36 @@ LEFT JOIN driver d ON LEFT JOIN ride ON ride.id = cm.ride_id left join payments on payments.rideId=cm.ride_id"; -$stmt = $con->prepare($sql); -$stmt->execute(); +try { + $stmt = $con->prepare($sql); + $stmt->execute(); -$row = $stmt->fetchAll(PDO::FETCH_ASSOC); + $row = $stmt->fetchAll(PDO::FETCH_ASSOC); -if ($row) { - foreach ($row as &$item) { - if (!empty($item['passengerName'])) { - $dec = $encryptionHelper->decryptData($item['passengerName']); - if ($dec) $item['passengerName'] = $dec; - } - if (!empty($item['driverName'])) { - $dec = $encryptionHelper->decryptData($item['driverName']); - if ($dec) $item['driverName'] = $dec; - } - if (!empty($item['driverToken'])) { - $dec = $encryptionHelper->decryptData($item['driverToken']); - if ($dec) $item['driverToken'] = $dec; - } - if (!empty($item['passengerToken'])) { - $dec = $encryptionHelper->decryptData($item['passengerToken']); - if ($dec) $item['passengerToken'] = $dec; + if ($row) { + foreach ($row as &$item) { + if (!empty($item['passengerName'])) { + $dec = $encryptionHelper->decryptData($item['passengerName']); + if ($dec) $item['passengerName'] = $dec; + } + if (!empty($item['driverName'])) { + $dec = $encryptionHelper->decryptData($item['driverName']); + if ($dec) $item['driverName'] = $dec; + } + if (!empty($item['driverToken'])) { + $dec = $encryptionHelper->decryptData($item['driverToken']); + if ($dec) $item['driverToken'] = $dec; + } + if (!empty($item['passengerToken'])) { + $dec = $encryptionHelper->decryptData($item['passengerToken']); + if ($dec) $item['passengerToken'] = $dec; + } } + jsonSuccess($row); + } else { + jsonSuccess([], "No complaints found"); } - jsonSuccess($row); -} else { - // Return empty success for admin dashboard instead of error - jsonSuccess([], "No complaints found"); +} catch (Exception $e) { + jsonError("Database error: " . $e->getMessage()); } ?> \ No newline at end of file