25-12-1/1

2025-12-01 07:52:54 +03:00
parent b1b8efdd7d
commit 9b1008a0bf
40 changed files with 2471 additions and 2039 deletions
--- a/lib/controller/auth/captin/invit_controller.dart
+++ b/lib/controller/auth/captin/invit_controller.dart
@@ -326,15 +326,45 @@ Download the Intaleq app now and enjoy your ride!
    return input; // Fallback for unrecognized formats
  }

+  String normalizeSyrianPhone(String input) {
+    String phone = input.trim();
+
+    // احذف كل شيء غير أرقام
+    phone = phone.replaceAll(RegExp(r'[^0-9]'), '');
+
+    // إذا يبدأ بـ 0 → احذفها
+    if (phone.startsWith('0')) {
+      phone = phone.substring(1);
+    }
+
+    // إذا يبدأ بـ 963 مكررة → احذف التكرار
+    while (phone.startsWith('963963')) {
+      phone = phone.substring(3);
+    }
+
+    // إذا يبدأ بـ 963 ولكن داخله كمان 963 → خليه مرة واحدة فقط
+    if (phone.startsWith('963') && phone.length > 12) {
+      phone = phone.substring(phone.length - 9); // آخر 9 أرقام
+    }
+
+    // الآن إذا كان بلا 963 → أضفها
+    if (!phone.startsWith('963')) {
+      phone = '963' + phone;
+    }
+
+    return phone;
+  }
+
  /// Sends an invitation to a potential new driver.
  void sendInvite() async {
    if (invitePhoneController.text.isEmpty) {
      mySnackeBarError('Please enter a phone number'.tr);
      return;
    }
+    // Format Syrian phone number: remove leading 0 and add +963
    String formattedPhoneNumber =
-        _formatSyrianPhoneNumber(invitePhoneController.text);
-    if (formattedPhoneNumber.length < 13) {
+        normalizeSyrianPhone(invitePhoneController.text);
+    if (formattedPhoneNumber.length != 12) {
      mySnackeBarError('Please enter a correct phone'.tr);
      return;
    }
@@ -370,22 +400,32 @@ Download the Intaleq app now and enjoy your ride!
      mySnackeBarError('Please enter a phone number'.tr);
      return;
    }
-    String formattedPhoneNumber =
-        _formatSyrianPhoneNumber(invitePhoneController.text);
-    if (formattedPhoneNumber.length < 13) {
+
+    // Format Syrian phone number: remove leading 0 and add +963
+    String formattedPhoneNumber = invitePhoneController.text.trim();
+    if (formattedPhoneNumber.startsWith('0')) {
+      formattedPhoneNumber = formattedPhoneNumber.substring(1);
+    }
+    formattedPhoneNumber = '+963$formattedPhoneNumber';
+
+    if (formattedPhoneNumber.length < 12) {
+      // +963 + 9 digits = 12+
      mySnackeBarError('Please enter a correct phone'.tr);
      return;
    }

-    var response =
-        await CRUD().post(link: AppLink.addInvitationPassenger, payload: {
-      "driverId": box.read(BoxName.driverID),
-      "inviterPassengerPhone": formattedPhoneNumber,
-    });
+    var response = await CRUD().post(
+      link: AppLink.addInvitationPassenger,
+      payload: {
+        "driverId": box.read(BoxName.driverID),
+        "inviterPassengerPhone": formattedPhoneNumber,
+      },
+    );

    if (response != 'failure') {
-      var d = (response);
+      var d = response;
      mySnackbarSuccess('Invite sent successfully'.tr);
+
      String message = '${'*Intaleq APP CODE*'.tr}\n\n'
          '${"Use this code in registration".tr}\n\n'
          '${"To get a gift for both".tr}\n\n'
--- a/lib/controller/auth/captin/login_captin_controller.dart
+++ b/lib/controller/auth/captin/login_captin_controller.dart
@@ -26,6 +26,7 @@ import '../../../views/auth/captin/otp_page.dart';
 import '../../../views/auth/captin/otp_token_page.dart';
 import '../../../views/auth/syria/pending_driver_page.dart';
 import '../../firebase/firbase_messge.dart';
+import '../../firebase/local_notification.dart';
 import '../../firebase/notification_service.dart';
 import '../../functions/encrypt_decrypt.dart';
 import '../../functions/package_info.dart';
@@ -177,11 +178,11 @@ class LoginDriverController extends GetxController {
        Uri.parse(AppLink.loginFirstTimeDriver),
        body: payload,
      );
-      // Log.print('response0: ${response0.body}');
-      // Log.print('request: ${response0.request}');
+      Log.print('response0: ${response0.body}');
+      Log.print('request: ${response0.request}');
      if (response0.statusCode == 200) {
        final decodedResponse1 = jsonDecode(response0.body);
-        // Log.print('decodedResponse1: ${decodedResponse1}');
+        Log.print('decodedResponse1: ${decodedResponse1}');

        final jwt = decodedResponse1['jwt'];
        box.write(BoxName.jwt, c(jwt));
@@ -253,6 +254,40 @@ class LoginDriverController extends GetxController {
        .join('');
  }

+  bool isInviteDriverFound = false;
+
+  Future updateInvitationCodeFromRegister() async {
+    var res = await CRUD().post(
+      link: AppLink.updateDriverInvitationDirectly,
+      payload: {
+        "inviterDriverPhone": box.read(BoxName.phoneDriver).toString(),
+        //  "driverId": box.read(BoxName.driverID).toString(),
+      },
+    );
+    Log.print('invite: ${res}');
+
+    if (res['status'] != 'failure') {
+      isInviteDriverFound = true;
+      update();
+      // mySnackbarSuccess("Code approved".tr); // Localized success message
+      box.write(BoxName.isInstall, '1');
+      NotificationController().showNotification(
+          "Code approved".tr, "Code approved".tr, 'tone2', '');
+
+      NotificationService.sendNotification(
+        target: (res)['message'][0]['token'].toString(),
+        title: 'You have received a gift token!'.tr,
+        body: 'for '.tr + box.read(BoxName.phoneDriver).toString(),
+        isTopic: false, // Important: this is a token
+        tone: 'tone2',
+        driverList: [], category: 'You have received a gift token!',
+      );
+    } else {
+      // mySnackeBarError(
+      //     "You dont have invitation code".tr); // Localized error message
+    }
+  }
+
  loginWithGoogleCredential(String driverID, email) async {
    isloading = true;
    update();
@@ -263,7 +298,7 @@ class LoginDriverController extends GetxController {
      // 'email': email ?? 'yet',
      'id': driverID,
    });
-    // Log.print('res: ${res}');
+    Log.print('loginWithGoogleCredential: ${res}');
    if (res == 'failure') {
      await isPhoneVerified();
      isloading = false; // <--- أضفت هذا أيضاً
@@ -314,6 +349,13 @@ class LoginDriverController extends GetxController {
          } else if (int.parse(d['year'].toString()) < 2002) {
            box.write(BoxName.carTypeOfDriver, 'Awfar Car');
          }
+
+// add invitations
+          if (box.read(BoxName.isInstall) == null ||
+              box.read(BoxName.isInstall).toString() == '0') {
+            updateInvitationCodeFromRegister();
+          }
+
          // updateAppTester(AppInformation.appName);
          if (d['status'].toString() != 'yet') {
            var token = await CRUD().get(
--- a/lib/controller/auth/captin/phone_helper_controller.dart
+++ b/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.');
--- a/lib/controller/auth/captin/register_captin_controller.dart
+++ b/lib/controller/auth/captin/register_captin_controller.dart
@@ -280,7 +280,7 @@ class RegisterCaptainController extends GetxController {
        //         box.read(BoxName.emailDriver).toString(),
        //       );
        // Get.offAll(() => SyrianCardAI());
-        Get.offAll(() => RegistrationView());
+        Get.to(() => RegistrationView());
        // } else {
        // Get.snackbar('title', 'message');
        // }
--- a/lib/controller/auth/syria/registration_controller.dart
+++ b/lib/controller/auth/syria/registration_controller.dart
@@ -58,6 +58,7 @@ class RegistrationController extends GetxController {
  final firstNameController = TextEditingController();
  final lastNameController = TextEditingController();
  final nationalIdController = TextEditingController();
+  final bithdateController = TextEditingController();
  final phoneController = TextEditingController(); // You can pre-fill this
  final driverLicenseExpiryController = TextEditingController();
  DateTime? driverLicenseExpiryDate;
@@ -101,14 +102,15 @@ class RegistrationController extends GetxController {
      isValid = driverInfoFormKey.currentState!.validate();
      if (isValid) {
        // Optional: Check if license is expired
-        if (driverLicenseExpiryDate != null &&
-            driverLicenseExpiryDate!.isBefore(DateTime.now())) {
-          Get.snackbar('Expired License', 'Your driver’s license has expired.',
-              snackPosition: SnackPosition.BOTTOM,
-              backgroundColor: Colors.red,
-              colorText: Colors.white);
-          return; // Stop progression
-        }
+        // if (driverLicenseExpiryDate != null &&
+        //     driverLicenseExpiryDate!.isBefore(DateTime.now())) {
+        //   Get.snackbar('Expired License', 'Your driver’s license has expired.'.tr
+        // ,
+        //       snackPosition: SnackPosition.BOTTOM,
+        //       backgroundColor: Colors.red,
+        //       colorText: Colors.white);
+        //   return; // Stop progression
+        // }
      }
    } else if (currentPage.value == 1) {
      // Validate Step 2
@@ -495,6 +497,7 @@ class RegistrationController extends GetxController {
      _addField(fields, 'last_name', lastNameController.text);
      _addField(fields, 'phone', box.read(BoxName.phoneDriver) ?? '');
      _addField(fields, 'national_number', nationalIdController.text);
+      _addField(fields, 'birthdate', bithdateController.text);
      _addField(fields, 'expiry_date', driverLicenseExpiryController.text);
      _addField(
          fields, 'password', 'generate_your_password_here'); // عدّل حسب منطقك