9/15/1

lib/controller/auth/onboarding_controller.dart

@@ -22,7 +22,7 @@ class OnBoardingControllerImp extends OnBoardingController {
 
     if (currentPage > onBoardingList.length - 1) {
       box.write(BoxName.onBoarding, 'yes');
-      Get.offAll(LoginPage());
+      Get.offAll(() => LoginPage());
     } else {
       pageController.animateToPage(currentPage,
           duration: const Duration(milliseconds: 900), curve: Curves.easeInOut);

lib/controller/auth/register_controller.dart

@@ -4,6 +4,7 @@ import 'dart:math';
 
 import 'package:SEFER/constant/colors.dart';
 import 'package:SEFER/views/home/map_page_passenger.dart';
+import 'package:SEFER/views/widgets/my_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/links.dart';
@@ -14,6 +15,7 @@ import 'package:SEFER/views/widgets/elevated_btn.dart';
 
 import '../../constant/box_name.dart';
 import '../../main.dart';
+import '../../print.dart';
 import '../../views/auth/verify_email_page.dart';
 import '../functions/sms_controller.dart';
 
@@ -113,80 +115,125 @@ class RegisterController extends GetxController {
   }
 
   sendOtpMessage() async {
-    SmsEgyptController smsEgyptController = Get.put(SmsEgyptController());
+    SmsEgyptController smsEgyptController;
 
-    int randomNumber = Random().nextInt(100000) + 1;
-    isLoading = true;
-    update();
-    if (formKey3.currentState!.validate()) {
-      if (box.read(BoxName.countryCode) == 'Egypt') {
-        if (isValidEgyptianPhoneNumber(phoneController.text) == true) {
-          var responseCheker = await CRUD()
-              .post(link: AppLink.checkPhoneNumberISVerfiedPassenger, payload: {
-            'phone_number': '+2${phoneController.text}',
+    try {
+      // Initialize SmsEgyptController
+      smsEgyptController = Get.put(SmsEgyptController());
+
+      // Generate a random OTP
+      int randomNumber = Random().nextInt(100000) + 1;
+
+      isLoading = true;
+      update();
+
+      // Get phone number from controller
+      String phoneNumber = phoneController.text;
+
+      // Check if the phone number is from Egypt (Assuming Egyptian numbers start with +20)
+      bool isEgyptianNumber = phoneNumber.startsWith('+20');
+      // print('dfdf${phoneNumber.toString().split('+2')[1]}');
+      if (isEgyptianNumber && phoneNumber.length == 13) {
+        // Check if the phone number is already verified
+        var responseChecker = await CRUD().post(
+          link: AppLink.checkPhoneNumberISVerfiedPassenger,
+          payload: {
+            'phone_number': phoneNumber,
             'email': box.read(BoxName.email),
-          });
-          if (responseCheker != 'failure') {
-            var d = jsonDecode(responseCheker);
-            if (d['message'][0]['verified'].toString() == '1') {
-              Get.snackbar('Phone number is verified before'.tr, '',
-                  backgroundColor: AppColor.greenColor);
-              box.write(BoxName.isVerified, '1');
-              box.write(BoxName.phone, '+2${phoneController.text}');
-              Get.offAll(const MapPagePassenger());
-            } else {
-              await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
-                'phone_number': '+2${phoneController.text}',
-                'token': randomNumber.toString(),
-              });
+          },
+        );
 
-              await smsEgyptController.sendSmsEgypt(
-                  phoneController.text.toString(), randomNumber.toString());
-              isSent = true;
-              remainingTime = 300; // Reset to 5 minutes
-              startTimer();
-              isLoading = false;
-              update();
-            }
+        if (responseChecker != 'failure') {
+          var data = jsonDecode(responseChecker);
+
+          // If the phone number is already verified
+          if (data['message'][0]['verified'].toString() == '1') {
+            Get.snackbar('Phone number is verified before'.tr, '',
+                backgroundColor: AppColor.greenColor);
+            box.write(BoxName.isVerified, '1');
+            box.write(BoxName.phone, phoneNumber);
+            Get.offAll(const MapPagePassenger());
           } else {
-            await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
-              'phone_number': '+2${phoneController.text}',
-              'token': randomNumber.toString(),
-            });
-
-            await smsEgyptController.sendSmsEgypt(
-                phoneController.text.toString(), randomNumber.toString());
-            isSent = true;
-            remainingTime = 300; // Reset to 5 minutes
-            startTimer();
-            isLoading = false;
-            update();
-
-            // Get.snackbar(responseCheker, 'message');
+            // If the phone number is not verified, send OTP
+            if (isEgyptianNumber) {
+              if (isValidEgyptianPhoneNumber(
+                  phoneNumber.toString().split('+2')[1])) {
+                await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
+                    smsEgyptController);
+              }
+            }
           }
-        } else if (isValidPhoneNumber(phoneController.text)) {
-          await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
-            'phone_number': '+${phoneController.text}',
-            'token': randomNumber.toString(),
-          });
-          await smsEgyptController.sendWhatsAppAuth(
-              phoneController.text, randomNumber.toString());
-          // await smsEgyptController.sendSmsEgypt(
-          //     phoneController.text.toString(), randomNumber.toString());
-          isSent = true;
-          remainingTime = 300; // Reset to 5 minutes
-          startTimer();
-          isLoading = false;
-          update();
         } else {
-          Get.snackbar('Phone Number wrong'.tr, '',
-              backgroundColor: AppColor.redColor,
-              duration: const Duration(seconds: 5));
+          // If verification check fails, still send OTP
+          if (isEgyptianNumber) {
+            if (isValidEgyptianPhoneNumber(
+                phoneNumber.toString().split('+2')[1])) {
+              await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
+                  smsEgyptController);
+            } else {
+              MyDialog().getDialog(
+                  'Error'.tr, "Phone number isn't an Egyptian phone number".tr,
+                  () {
+                Get.back();
+              });
+            }
+          }
         }
+      } else {
+        // MyDialog().getDialog(
+        //     'Error'.tr, 'Phone number must be exactly 11 digits long'.tr, () {
+        //   Get.back();
+        // });
+        sendOtp(
+            phoneNumber, randomNumber, isEgyptianNumber, smsEgyptController);
+        print(phoneNumber);
       }
+    } catch (e) {
+      // Handle error
+      print('Error: $e');
+    } finally {
+      isLoading = false;
+      update();
     }
   }
 
+// Helper function to send OTP or WhatsApp message based on phone number location
+  Future<void> sendOtp(String phoneNumber, int otp, bool isEgyptian,
+      SmsEgyptController controller) async {
+    // Trim any leading or trailing whitespace from the phone number
+    phoneNumber = phoneNumber.trim();
+    Log.print('phoneNumber: ${phoneNumber}');
+
+    if (isEgyptian) {
+      // Check if the phone number has exactly 11 digits
+      if (phoneNumber.length == 11 &&
+          RegExp(r'^\d{11}$').hasMatch(phoneNumber)) {
+        // Send SMS for Egyptian phone numbers
+        await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
+          'phone_number': phoneNumber,
+          'token': otp.toString(),
+        });
+
+        await controller.sendSmsEgypt(phoneNumber, otp.toString());
+        print('SMS sent to Egyptian phone number: $phoneNumber');
+      } else {
+        // Show error dialog if phone number is invalid
+        MyDialog().getDialog('Invalid Phone Number',
+            'The phone number must be exactly 11 digits long.', () {
+          Get.back();
+        });
+      }
+    } else {
+      // Send WhatsApp message for non-Egyptian phone numbers
+      await CRUD().sendWhatsAppAuth(phoneNumber, otp.toString());
+      print('WhatsApp message sent to non-Egyptian phone number: $phoneNumber');
+    }
+
+    isSent = true;
+    remainingTime = 300; // Reset to 5 minutes
+    startTimer();
+  }
+
   verifySMSCode() async {
     // if (formKey3.currentState!.validate()) {
     if (isValidEgyptianPhoneNumber(phoneController.text)) {