Update: 2026-06-14 22:10:07

siro_admin/lib/views/admin/drivers/monitor_ride.dart

@@ -41,6 +41,33 @@ class DriverLocation {
 /// 2. GETX CONTROLLER
 /// --------------------------------------------------------------------------
 
+/// تطبيع رقم الهاتف تلقائياً حسب الدولة
+/// مثال: 0992952235 ← 963992952235 (سوريا)
+/// مثال: 079XXXXXXX ← 96279XXXXXXX (أردن)
+/// مثال: 010XXXXXXXX ← 2010XXXXXXXX (مصر)
+String normalizePhone(String input) {
+  final clean = input.replaceAll(RegExp(r'\D+'), '');
+
+  // Syria: 099XXXXXXX or 9639XXXXXXX
+  if (clean.length == 10 && clean.startsWith('09'))
+    return '963${clean.substring(1)}';
+  if (clean.length == 12 && clean.startsWith('963')) return clean;
+  if (clean.length == 9 && clean.startsWith('9')) return '963$clean';
+
+  // Jordan: 079XXXXXXX or 9627XXXXXXX
+  if (clean.length == 10 && clean.startsWith('07'))
+    return '962${clean.substring(1)}';
+  if (clean.length == 12 && clean.startsWith('962')) return clean;
+  if (clean.length == 9 && clean.startsWith('7')) return '962$clean';
+
+  // Egypt: 010XXXXXXXX or 2010XXXXXXXX
+  if (clean.length == 11 && clean.startsWith('01'))
+    return '20${clean.substring(1)}';
+  if (clean.length == 13 && clean.startsWith('20')) return clean;
+
+  return clean;
+}
+
 class RideMonitorController extends GetxController {
   // CONFIGURATION
   final String apiUrl = "${AppLink.server}/Admin/rides/monitorRide.php";
@@ -129,9 +156,11 @@ class RideMonitorController extends GetxController {
     if (phone.isEmpty) return;
 
     try {
+      // تطبيع رقم الهاتف تلقائياً حسب الدولة
+      String normalizedPhone = normalizePhone(phone);
       final response = await CRUD().post(
         link: apiUrl,
-        payload: {"phone": "963$phone"},
+        payload: {"phone": normalizedPhone},
       );
 
       if (response != 'failure') {