25-12-1/1

lib/controller/auth/otp_controller.dart

@@ -19,21 +19,78 @@ class PhoneAuthHelper {
   static final String _verifyOtpUrl = '${_baseUrl}verifyOtp.php';
   static final String _registerUrl = '${_baseUrl}register_passenger.php';
 
+  static String formatSyrianPhone(String phone) {
+    // Remove spaces, symbols, +, -, ()
+    phone = phone.replaceAll(RegExp(r'[ \-\(\)\+]'), '').trim();
+
+    // Normalize 00963 → 963
+    if (phone.startsWith('00963')) {
+      phone = phone.replaceFirst('00963', '963');
+    }
+
+    // Normalize 0963 → 963
+    if (phone.startsWith('0963')) {
+      phone = phone.replaceFirst('0963', '963');
+    }
+
+    // NEW: Fix 96309xxxx → 9639xxxx
+    if (phone.startsWith('96309')) {
+      phone = '9639' + phone.substring(5); // remove the "0" after 963
+    }
+
+    // If starts with 9630 → correct to 9639
+    if (phone.startsWith('9630')) {
+      phone = '9639' + phone.substring(4);
+    }
+
+    // If already in correct format: 9639xxxxxxxx
+    if (phone.startsWith('9639') && phone.length == 12) {
+      return phone;
+    }
+
+    // If starts with 963 but missing the 9
+    if (phone.startsWith('963') && phone.length > 3) {
+      // Ensure it begins with 9639
+      if (!phone.startsWith('9639')) {
+        phone = '9639' + phone.substring(3);
+      }
+      return phone;
+    }
+
+    // If starts with 09xxxxxxxx → 9639xxxxxxxx
+    if (phone.startsWith('09')) {
+      return '963' + phone.substring(1);
+    }
+
+    // If 9xxxxxxxx (9 digits)
+    if (phone.startsWith('9') && phone.length == 9) {
+      return '963' + phone;
+    }
+
+    // If starts with incorrect 0xxxxxxx → assume Syrian and fix
+    if (phone.startsWith('0') && phone.length == 10) {
+      return '963' + phone.substring(1);
+    }
+
+    return phone;
+  }
+
   /// Sends an OTP to the provided phone number.
   static Future<bool> sendOtp(String phoneNumber) async {
     try {
-      // Log.print('_sendOtpUrl: ${_sendOtpUrl}');
-      // Log.print('phoneNumber: ${phoneNumber}');
+      // إصلاح الرقم قبل الإرسال
+      final fixedPhone = formatSyrianPhone(phoneNumber);
 
       final response = await CRUD().post(
         link: _sendOtpUrl,
-        payload: {'receiver': phoneNumber},
+        payload: {'receiver': fixedPhone}, // ← ← استخدام الرقم المُعدّل
       );
-      // Log.print('response: ${response}');
+
       if (response != 'failure') {
-        final data = (response);
+        final data = response;
+
         if (data['status'] == 'success') {
-          mySnackbarSuccess('An OTP has been sent to your WhatsApp number.'.tr);
+          mySnackbarSuccess('An OTP has been sent to your number.'.tr);
           return true;
         } else {
           mySnackeBarError(data['message'] ?? 'Failed to send OTP.');
@@ -44,19 +101,20 @@ class PhoneAuthHelper {
         return false;
       }
     } catch (e) {
-      // Log.print('e: ${e}');
-      // mySnackeBarError('An error occurred: $e');
       return false;
     }
   }
 
   /// Verifies the OTP and logs the user in.
 
-  static Future<void> verifyOtp(String phoneNumber, String otp) async {
+  static Future<void> verifyOtp(String phoneNumber) async {
     try {
+      final fixedPhone = formatSyrianPhone(phoneNumber);
       final response = await CRUD().post(
         link: _verifyOtpUrl,
-        payload: {'phone_number': phoneNumber, 'otp': otp},
+        payload: {
+          'phone_number': fixedPhone,
+        },
       );
 
       if (response != 'failure') {
@@ -96,13 +154,12 @@ class PhoneAuthHelper {
       'passengerID': box.read(BoxName.passengerID).toString(),
       "fingerPrint": fingerPrint
     });
-    await CRUD().post(
-        link: "${AppLink.seferPaymentServer}/ride/firebase/add.php",
-        payload: {
-          'token': (box.read(BoxName.tokenFCM.toString())),
-          'passengerID': box.read(BoxName.passengerID).toString(),
-          "fingerPrint": fingerPrint
-        });
+    await CRUD()
+        .post(link: "${AppLink.paymentServer}/ride/firebase/add.php", payload: {
+      'token': (box.read(BoxName.tokenFCM.toString())),
+      'passengerID': box.read(BoxName.passengerID).toString(),
+      "fingerPrint": fingerPrint
+    });
   }
 
   static Future<void> registerUser({