feat: استيراد كود سيرو إلى تريبز (سيرو @ecfe7568) — بلا تعديل
قرار المالك 2026-07-27: باك إند سيرو PHP هو المعتمد، وتطبيقاته المجرّبة ميدانياً تحل محل إعادة البناء المؤرشفة. سيرو نفسه لم يُمسّ. الخريطة: backend · payment_server · loction_server · ride_server · passenger_server · docker · dashboard · stress_test → الجذر siro_rider → apps/rider siro_driver → apps/driver siro_admin → dashboards/admin siro_service → dashboards/service android_bot → apps/android_bot socialBot → apps/socialBot نُسخ المتعقَّب في git سيرو فقط عبر `git archive` (3,198 ملفاً / ~169 م.ب) لا `cp -r` — فاستُثنيت مخلفات البناء تلقائياً. بلا أي تعديل محتوى عمداً: كل ما يلي يصير فرقاً مقروءاً مقابل المصدر. لم يُستورد وسببه: siromove.com (الموقع التسويقي يبقى marketing/ في تريبز، سيرو فيه 8 ملفات) · docs و planning (تريبز له docs/ الخاص) · deploy.sh (ليس نشراً على سيرفر بل `git add . && git push origin --all` — فخّ في مستودع آخر) · transit_dashboard (بانتظار قرار مصير backend-transit و dashboards/transit-web). ⚠️ لا يبني بعد — ثلاثة نواقص متوقعة ومقصودة: 1. `.env` و `lib/env/env.g.dart` غير متعقَّبين في سيرو (أسرار لكل مستأجر): كل تطبيق فلاتر يحتاج .env خاصاً ثم توليد env.g.dart بـ build_runner. 2. إعدادات Firebase (9 ملفات google-services.json و GoogleService-Info.plist) يستبعدها .gitignore تريبز — ولكل مستأجر مشروع Firebase خاص أصلاً. 3. apps/driver في سيرو يشير إلى `../../Intaleq/packages/get` خارج المستودع → يجب ضمّ الحزم داخله أسوة بـ apps/rider. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
9909d9b4c1
commit
4d8414c96b
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
require_once __DIR__ . '/../../connect.php';
|
||||
$driverID = filterRequest("driverID");
|
||||
|
||||
$sql = "SELECT
|
||||
YEAR(`driver_orders`.`created_at`) AS `year`,
|
||||
MONTH(`driver_orders`.`created_at`) AS `month`,
|
||||
COUNT(*) AS `total_orders`,
|
||||
SUM(CASE WHEN `ride`.`status` = 'Finished' THEN 1 ELSE 0 END) AS `completed_orders`,
|
||||
SUM(CASE WHEN `ride`.`status` = 'Apply' THEN 1 ELSE 0 END) AS `pending_orders`,
|
||||
SUM(CASE WHEN `ride`.`status` = 'Cancel' THEN 1 ELSE 0 END) AS `canceled_orders`,
|
||||
ROUND(SUM(CASE WHEN `ride`.`status` = 'Finished' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2) AS `percent_completed`,
|
||||
ROUND(SUM(CASE WHEN `ride`.`status` = 'Apply' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2) AS `percent_pending`,
|
||||
ROUND(SUM(CASE WHEN `ride`.`status` = 'Cancel' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2) AS `percent_canceled`,
|
||||
SUM(CASE WHEN `ride`.`status` = 'Refused' THEN 1 ELSE 0 END) AS `rejected_orders`,
|
||||
ROUND(SUM(CASE WHEN `ride`.`status` = 'Refused' THEN 1 ELSE 0 END) / COUNT(*) * 100, 2) AS `percent_rejected`
|
||||
FROM
|
||||
`driver_orders`
|
||||
LEFT JOIN `ride` ON `ride`.`id` = `driver_orders`.`order_id`
|
||||
WHERE
|
||||
`driver_orders`.`driver_id` = '$driverID'
|
||||
AND YEAR(`driver_orders`.`created_at`) = YEAR(CURDATE())
|
||||
AND MONTH(`driver_orders`.`created_at`) = MONTH(CURDATE())
|
||||
GROUP BY
|
||||
YEAR(`driver_orders`.`created_at`),
|
||||
MONTH(`driver_orders`.`created_at`)
|
||||
ORDER BY
|
||||
`year`,
|
||||
`month`;
|
||||
|
||||
";
|
||||
$stmt = $con->prepare($sql);
|
||||
$stmt->execute();
|
||||
|
||||
if ($stmt->rowCount() > 0) {
|
||||
// Fetch the record
|
||||
$row = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
jsonSuccess($row);
|
||||
|
||||
}
|
||||
else{
|
||||
// Print a failure message
|
||||
jsonError($message = "No wallet record found");
|
||||
}
|
||||
?>
|
||||
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
require_once __DIR__ . '/../../connect.php';
|
||||
|
||||
$driver_phone = filterRequest("driver_phone");
|
||||
|
||||
$sql = "SELECT
|
||||
`driverToken`.`token`,
|
||||
`driver`.`id`,
|
||||
`driver`.`phone`,
|
||||
`driver`.`name_arabic`as name,
|
||||
driver.national_number
|
||||
FROM
|
||||
`driverToken`
|
||||
LEFT JOIN `driver` ON `driver`.`id` = `driverToken`.`captain_id`
|
||||
WHERE
|
||||
`driver`.`phone` = '$driver_phone'";
|
||||
|
||||
$stmt = $con->prepare($sql);
|
||||
$stmt->execute();
|
||||
$data = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
if ($data) {
|
||||
// Print the car location data as JSON
|
||||
echo json_encode([
|
||||
'status' => 'success',
|
||||
|
||||
'data' => $data
|
||||
]);
|
||||
} else {
|
||||
// Print a failure message
|
||||
jsonError($message = "No car locations found");
|
||||
}
|
||||
|
||||
?>
|
||||
@@ -0,0 +1,146 @@
|
||||
<?php
|
||||
// backend/ride/driverWallet/transfer.php
|
||||
|
||||
require_once __DIR__ . '/../../connect.php';
|
||||
|
||||
header('Content-Type: application/json');
|
||||
|
||||
// 1. الـ Sender ID من JWT مباشرة (connect.php) — ممنوع استقباله من الـ request
|
||||
if (empty($user_id) || $role !== 'driver') {
|
||||
http_response_code(403);
|
||||
echo json_encode(['status' => 'error', 'message' => 'Unauthorized']);
|
||||
exit;
|
||||
}
|
||||
|
||||
// 1.1 HMAC إلزامي على تحويلات المحفظة (عملية حساسة تحرّك أموالاً حقيقية)
|
||||
if (empty($_SERVER['HTTP_X_HMAC_AUTH'] ?? null)) {
|
||||
http_response_code(403);
|
||||
echo json_encode(['status' => 'error', 'message' => 'Request verification required']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$senderID = $user_id; // ✅ من JWT
|
||||
$receiverPhone = filterRequest('receiverPhone');
|
||||
$amount = filterRequest('amount');
|
||||
$country = filterRequest('country');
|
||||
|
||||
if (empty($receiverPhone) || empty($amount) || empty($country)) {
|
||||
echo json_encode(['status' => 'error', 'message' => 'Missing required fields']);
|
||||
exit;
|
||||
}
|
||||
|
||||
// 2. حد أقصى للتحويل (حسب الدولة والعملة)
|
||||
$maxAmount = 1000000; // افتراضي
|
||||
$amountInt = (int)$amount;
|
||||
if ($amountInt <= 0) {
|
||||
echo json_encode(['status' => 'error', 'message' => 'Invalid amount']);
|
||||
exit;
|
||||
}
|
||||
$countryLower = strtolower($country);
|
||||
if ($countryLower === 'syria') $maxAmount = 500;
|
||||
elseif ($countryLower === 'jordan') $maxAmount = 15;
|
||||
elseif ($countryLower === 'egypt') $maxAmount = 1000;
|
||||
|
||||
if ($amountInt > $maxAmount) {
|
||||
echo json_encode(['status' => 'error', 'message' => "Transfer amount exceeds maximum limit of $maxAmount"]);
|
||||
exit;
|
||||
}
|
||||
|
||||
// 3. Fetch Receiver details
|
||||
$stmt = $con->prepare("SELECT d.id as driver_id, dt.token as fcm_token, d.name_arabic
|
||||
FROM driver d
|
||||
LEFT JOIN driverToken dt ON d.id = dt.captain_id
|
||||
WHERE d.phone = :phone LIMIT 1");
|
||||
$stmt->execute([':phone' => $receiverPhone]);
|
||||
$receiver = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
if (!$receiver) {
|
||||
echo json_encode(['status' => 'error', 'message' => 'Receiver not found']);
|
||||
exit;
|
||||
}
|
||||
|
||||
$receiverID = $receiver['driver_id'];
|
||||
|
||||
if ($receiverID == $senderID) {
|
||||
echo json_encode(['status' => 'error', 'message' => 'Cannot transfer to yourself']);
|
||||
exit;
|
||||
}
|
||||
|
||||
// 4. Determine Payment Server URL based on Country
|
||||
$walletServer = "https://walletintaleq.intaleq.xyz"; // Default
|
||||
if (strtolower($country) === 'jordan') {
|
||||
$walletServer = getenv('WALLET_SERVER_JORDAN') ?: "https://walletintaleq.intaleq.xyz";
|
||||
} elseif (strtolower($country) === 'egypt') {
|
||||
$walletServer = getenv('WALLET_SERVER_EGYPT') ?: "https://walletintaleq.intaleq.xyz";
|
||||
} elseif (strtolower($country) === 'syria') {
|
||||
$walletServer = getenv('WALLET_SERVER_SYRIA') ?: "https://walletintaleq.intaleq.xyz";
|
||||
}
|
||||
|
||||
$paymentServerUrl = "$walletServer/v2/main/ride/driverWallet/transfer.php";
|
||||
|
||||
$postData = [
|
||||
'senderID' => $senderID,
|
||||
'receiverID' => $receiverID,
|
||||
'amount' => $amountInt,
|
||||
'country' => $country
|
||||
];
|
||||
|
||||
// Generate Headers for Payment Server (Use internal payment key)
|
||||
$headers = [];
|
||||
$paymentKey = getenv('PAYMENT_KEY');
|
||||
|
||||
if (empty($paymentKey)) {
|
||||
error_log("CRITICAL: PAYMENT_KEY environment variable is not set. Transfer blocked.");
|
||||
echo json_encode(['status' => 'error', 'message' => 'Payment configuration error']);
|
||||
exit;
|
||||
}
|
||||
$headers[] = "payment-key: $paymentKey";
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL, $paymentServerUrl);
|
||||
curl_setopt($ch, CURLOPT_POST, 1);
|
||||
curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($postData));
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
|
||||
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
|
||||
|
||||
$paymentResponseRaw = curl_exec($ch);
|
||||
$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||
curl_close($ch);
|
||||
|
||||
$paymentResponse = json_decode($paymentResponseRaw, true);
|
||||
|
||||
// 5. Handle Payment Server Response
|
||||
if ($httpCode === 200 && isset($paymentResponse['status']) && $paymentResponse['status'] === 'success') {
|
||||
// Transaction successful, send Push Notification
|
||||
if (!empty($receiver['fcm_token'])) {
|
||||
$senderName = $decodedToken->name ?? 'A driver'; // Optional: Fetch sender name
|
||||
|
||||
$fcmBody = "You have received a transfer of " . $amountInt . " from " . $senderName;
|
||||
// Arabic fallback if name available
|
||||
$fcmBodyAr = "لقد تلقيت حوالة بقيمة " . $amountInt . " من " . $senderName;
|
||||
|
||||
sendFCM_Internal(
|
||||
$receiver['fcm_token'],
|
||||
"Transfer Received",
|
||||
$fcmBodyAr,
|
||||
['type' => 'transfer', 'amount' => $amountInt],
|
||||
'Transfer',
|
||||
false,
|
||||
'ding'
|
||||
);
|
||||
}
|
||||
|
||||
echo json_encode([
|
||||
'status' => 'success',
|
||||
'message' => 'Transfer completed successfully',
|
||||
'receiver' => $receiver['name_arabic']
|
||||
]);
|
||||
} else {
|
||||
// Payment failed or server error — ممنوع تسريب debug في الإنتاج
|
||||
error_log("[transfer] Payment server error | HTTP: $httpCode | Response: $paymentResponseRaw");
|
||||
echo json_encode([
|
||||
'status' => 'error',
|
||||
'message' => $paymentResponse['message'] ?? 'Payment server error'
|
||||
]);
|
||||
}
|
||||
?>
|
||||
Reference in New Issue
Block a user