Hamza/intaleq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix payment server: remove global conRide to prevent crashing non-ride DB queries

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-01 16:23:52 +03:00
parent 0966699070
commit 4846109824
3 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
payment_server/v2/main/connect.php
+1 -8
View File
@@ -53,14 +53,7 @@ try {
];
$con = new PDO($dsn, $user, $pass, $options);
// Ride DB Connection (for cross-db queries)
$rideDbname = getenv('DB_RIDE_NAME') ?: 'rideDB';
$rideDbHost = getenv('DB_RIDE_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
$rideUser = getenv('DB_RIDE_USER') ?: 'root';
$ridePass = getenv('DB_RIDE_PASS') ?: getenv('MYSQL_ROOT_PASSWORD') ?: '';
$dsnRide = "mysql:host=$rideDbHost;dbname=$rideDbname;charset=utf8mb4";
$conRide = new PDO($dsnRide, $rideUser, $ridePass, $options);
// 5. JWT Authentication
include __DIR__ . "/functions.php";
payment_server/v2/main/ride/payment/getAllPayment.php
+29 -11
View File
@@ -3,17 +3,35 @@ include "../../connect.php";
$driverID = filterRequest("driverID");
try {
// 1. Get ride stats using $conRide
$sqlRide = "SELECT
(SELECT COUNT(*) FROM `ride` WHERE LOWER(`status`) IN ('finished','completed') AND `created_at` BETWEEN CURRENT_DATE() + INTERVAL 7 HOUR AND CURRENT_DATE() + INTERVAL 10 HOUR AND `driver_id` = :driverID) AS morning_count,
(SELECT COUNT(*) FROM `ride` WHERE LOWER(`status`) IN ('finished','completed') AND `created_at` BETWEEN CURRENT_DATE() + INTERVAL 15 HOUR AND CURRENT_DATE() + INTERVAL 18 HOUR AND `driver_id` = :driverID) AS afternoon_count,
(SELECT COALESCE(SUM(price), 0) FROM `ride` WHERE `driver_id` = :driverID AND LOWER(`status`) IN ('finished','completed') AND `created_at` > CURRENT_DATE() - INTERVAL 1 WEEK) AS total_amount_last_week
FROM dual";
$stmtRide = $conRide->prepare($sqlRide);
$stmtRide->bindValue(':driverID', $driverID);
$stmtRide->execute();
$rideStats = $stmtRide->fetch(PDO::FETCH_ASSOC) ?: [];
// 1. Get ride stats using local $conRide
$rideStats = [];
try {
$rideDbname = getenv('DB_RIDE_NAME') ?: 'rideDB';
$rideDbHost = getenv('DB_RIDE_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
$rideUser = getenv('DB_RIDE_USER') ?: 'root';
$ridePass = getenv('DB_RIDE_PASS') ?: getenv('MYSQL_ROOT_PASSWORD') ?: '';
$dsnRide = "mysql:host=$rideDbHost;dbname=$rideDbname;charset=utf8mb4";
$options = [
PDO::ATTR_EMULATE_PREPARES => false,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
];
$conRide = new PDO($dsnRide, $rideUser, $ridePass, $options);
$sqlRide = "SELECT
(SELECT COUNT(*) FROM `ride` WHERE LOWER(`status`) IN ('finished','completed') AND `created_at` BETWEEN CURRENT_DATE() + INTERVAL 7 HOUR AND CURRENT_DATE() + INTERVAL 10 HOUR AND `driver_id` = :driverID) AS morning_count,
(SELECT COUNT(*) FROM `ride` WHERE LOWER(`status`) IN ('finished','completed') AND `created_at` BETWEEN CURRENT_DATE() + INTERVAL 15 HOUR AND CURRENT_DATE() + INTERVAL 18 HOUR AND `driver_id` = :driverID) AS afternoon_count,
(SELECT COALESCE(SUM(price), 0) FROM `ride` WHERE `driver_id` = :driverID AND LOWER(`status`) IN ('finished','completed') AND `created_at` > CURRENT_DATE() - INTERVAL 1 WEEK) AS total_amount_last_week
FROM dual";
$stmtRide = $conRide->prepare($sqlRide);
$stmtRide->bindValue(':driverID', $driverID);
$stmtRide->execute();
$rideStats = $stmtRide->fetch(PDO::FETCH_ASSOC) ?: [];
} catch (Exception $e) {
error_log('[getAllPayment] DB_RIDE Connection Error: ' . $e->getMessage());
$rideStats = ['morning_count' => 0, 'afternoon_count' => 0, 'total_amount_last_week' => 0];
}
// 2. Get payment stats using $con
$sqlPayment = "SELECT COALESCE(SUM(amount), 0) AS total_amount FROM payments WHERE isGiven = 'waiting' AND `driverID` = :driverID";
payment_server/v2/main/ride/payment/getCountRide.php
+12
View File
@@ -13,6 +13,18 @@ WHERE
";
// كان المعرّف يُدمج في نص الاستعلام مباشرةً — حقن SQL.
try {
$rideDbname = getenv('DB_RIDE_NAME') ?: 'rideDB';
$rideDbHost = getenv('DB_RIDE_HOST') ?: (getenv('DB_HOST') ?: 'mysql');
$rideUser = getenv('DB_RIDE_USER') ?: 'root';
$ridePass = getenv('DB_RIDE_PASS') ?: getenv('MYSQL_ROOT_PASSWORD') ?: '';
$dsnRide = "mysql:host=$rideDbHost;dbname=$rideDbname;charset=utf8mb4";
$options = [
PDO::ATTR_EMULATE_PREPARES => false,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
];
$conRide = new PDO($dsnRide, $rideUser, $ridePass, $options);
$stmt = $conRide->prepare($sql);
$stmt->bindValue(':driver_id', $driver_id);
$stmt->execute();