25-12-1/1

lib/controller/auth/captin/phone_helper_controller.dart

@@ -18,14 +18,77 @@ class PhoneAuthHelper {
   static final String _sendOtpUrl = '${_baseUrl}sendWhatsAppDriver.php';
   static final String _verifyOtpUrl = '${_baseUrl}verifyOtp.php';
   static final String _registerUrl = '${_baseUrl}register_driver.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');
+    }
+    if (phone.startsWith('096309')) {
+      phone = phone.replaceFirst('096309', '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 {
+      final fixedPhone = formatSyrianPhone(phoneNumber);
+      Log.print('fixedPhone: $fixedPhone');
+
       final response = await CRUD().post(
         link: _sendOtpUrl,
-        payload: {'receiver': phoneNumber},
+        payload: {'receiver': fixedPhone},
       );
+      Log.print('fixedPhone: ${fixedPhone}');
+
       if (response != 'failure') {
         final data = (response);
         Log.print('data: ${data}');
@@ -49,10 +112,12 @@ class PhoneAuthHelper {
   /// Verifies the OTP and logs the user in.
   static Future<void> verifyOtp(String phoneNumber) async {
     try {
+      final fixedPhone = formatSyrianPhone(phoneNumber);
+      Log.print('fixedPhone: $fixedPhone');
       final response = await CRUD().post(
         link: _verifyOtpUrl,
         payload: {
-          'phone_number': phoneNumber,
+          'phone_number': fixedPhone,
         },
       );
 
@@ -80,7 +145,7 @@ class PhoneAuthHelper {
             // ✅ رقم الهاتف تم التحقق منه لكن السائق غير مسجل
             // mySnackbarSuccess('Phone verified. Please complete registration.');
             // Get.offAll(() => SyrianCardAI());
-            Get.offAll(() => RegistrationView());
+            Get.to(() => RegistrationView());
           }
         } else {
           mySnackeBarError(data['message'] ?? 'Verification failed.');