Initial commit for Intaleq Driver

lib/controller/auth/captin/login_captin_controller.dart

@@ -5,9 +5,8 @@ import 'package:crypto/crypto.dart';
 import 'dart:math';
 import 'package:http/http.dart' as http;
 import 'package:permission_handler/permission_handler.dart';
-import 'package:secure_string_operations/secure_string_operations.dart';
-import 'package:sefer_driver/controller/functions/location_background_controller.dart';
 import 'package:sefer_driver/views/auth/captin/cards/sms_signup.dart';
+import 'package:sefer_driver/views/auth/syria/registration_view.dart';
 import 'package:sefer_driver/views/widgets/elevated_btn.dart';
 import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
@@ -21,13 +20,10 @@ import 'package:sefer_driver/views/home/Captin/home_captain/home_captin.dart';
 import 'package:location/location.dart';
 
 import '../../../constant/api_key.dart';
-import '../../../constant/char_map.dart';
 import '../../../constant/info.dart';
-import '../../../constant/table_names.dart';
-import '../../../print.dart';
-import '../../../views/auth/captin/cards/syrian_card_a_i.dart';
 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 '../../functions/encrypt_decrypt.dart';
 import '../../functions/package_info.dart';
@@ -79,11 +75,11 @@ class LoginDriverController extends GetxController {
     var res = await CRUD().get(
         link: AppLink.getTesterApp,
         payload: {'appPlatform': AppInformation.appName});
-    Log.print('res: ${res}');
+    // Log.print('res: ${res}');
     if (res != 'failure') {
       var d = jsonDecode(res);
       isTest = d['message'][0]['isTest'];
-      Log.print('isTest: ${isTest}');
+      // Log.print('isTest: ${isTest}');
       box.write(BoxName.isTest, isTest);
 
       // Log.print('isTest: ${box.read(BoxName.isTest)}');
@@ -108,7 +104,8 @@ class LoginDriverController extends GetxController {
       )
     });
     if (res != 'failure') {
-      Get.offAll(() => SyrianCardAI());
+      // Get.offAll(() => SyrianCardAI());
+      Get.offAll(() => RegistrationView());
 
       // isloading = false;
       // update();
@@ -322,46 +319,53 @@ class LoginDriverController extends GetxController {
           } else if (int.parse(d['year'].toString()) < 2002) {
             box.write(BoxName.carTypeOfDriver, 'Awfar Car');
           }
-          updateAppTester(AppInformation.appName);
+          // updateAppTester(AppInformation.appName);
+          if (d['status'].toString() != 'yet') {
+            var token = await CRUD().get(
+                link: AppLink.getDriverToken,
+                payload: {
+                  'captain_id': (box.read(BoxName.driverID)).toString()
+                });
 
-          var token = await CRUD().get(
-              link: AppLink.getDriverToken,
-              payload: {'captain_id': (box.read(BoxName.driverID)).toString()});
-
-          String fingerPrint = await DeviceHelper.getDeviceFingerprint();
-          await storage.write(
-              key: BoxName.fingerPrint, value: fingerPrint.toString());
-          // print(jsonDecode(token)['data'][0]['token'].toString());
-          // print(box.read(BoxName.tokenDriver).toString());
-          if (email == '962798583052@intaleqapp.com') {
-          } else {
-            if (token != 'failure') {
-              if ((jsonDecode(token)['data'][0]['token'].toString()) !=
-                  box.read(BoxName.tokenDriver).toString()) {
-                await Get.defaultDialog(
-                  title: 'Device Change Detected'.tr,
-                  middleText: 'Please verify your identity'.tr,
-                  textConfirm: 'Verify'.tr,
-                  confirmTextColor: Colors.white,
-                  onConfirm: () {
-                    // Get.back();
-                    // انتقل لصفحة OTP الجديدة
-                    Get.to(
-                      () => OtpVerificationPage(
-                        phone: d['phone'].toString(),
-                        deviceToken: fingerPrint.toString(),
-                        token: token.toString(),
-                        ptoken:
-                            jsonDecode(token)['data'][0]['token'].toString(),
-                      ),
-                    );
-                  },
-                );
+            String fingerPrint = await DeviceHelper.getDeviceFingerprint();
+            await storage.write(
+                key: BoxName.fingerPrint, value: fingerPrint.toString());
+            // print(jsonDecode(token)['data'][0]['token'].toString());
+            // print(box.read(BoxName.tokenDriver).toString());
+            if (email == '962798583052@intaleqapp.com') {
+            } else {
+              if (token != 'failure') {
+                if ((jsonDecode(token)['data'][0]['token'].toString()) !=
+                    box.read(BoxName.tokenDriver).toString()) {
+                  await Get.defaultDialog(
+                    title: 'Device Change Detected'.tr,
+                    middleText: 'Please verify your identity'.tr,
+                    textConfirm: 'Verify'.tr,
+                    confirmTextColor: Colors.white,
+                    onConfirm: () {
+                      // Get.back();
+                      // انتقل لصفحة OTP الجديدة
+                      Get.to(
+                        () => OtpVerificationPage(
+                          phone: d['phone'].toString(),
+                          deviceToken: fingerPrint.toString(),
+                          token: token.toString(),
+                          ptoken:
+                              jsonDecode(token)['data'][0]['token'].toString(),
+                        ),
+                      );
+                    },
+                  );
+                }
               }
             }
+
+            Get.offAll(() => HomeCaptain());
+          } else {
+            Get.off(() => DriverVerificationScreen());
           }
 
-          Get.off(() => HomeCaptain());
+          // Get.off(() => HomeCaptain());
         } else {
           Get.offAll(() => PhoneNumberScreen());
 
@@ -476,7 +480,8 @@ class LoginDriverController extends GetxController {
     if (res == 'failure') {
       //Failure
       if (box.read(BoxName.phoneVerified).toString() == '1') {
-        Get.offAll(() => SyrianCardAI());
+        // Get.offAll(() => SyrianCardAI());
+        Get.offAll(() => RegistrationView());
       } else {
         Get.offAll(() => SmsSignupEgypt());
       }
@@ -551,24 +556,7 @@ class LoginDriverController extends GetxController {
                           'captain_id': box.read(BoxName.driverID).toString(),
                           'fingerPrint': (fingerPrint).toString()
                         });
-                        await CRUD().post(
-                            link:
-                                "${AppLink.seferAlexandriaServer}/ride/firebase/addDriver.php",
-                            payload: {
-                              'token': box.read(BoxName.tokenDriver),
-                              'captain_id':
-                                  box.read(BoxName.driverID).toString(),
-                              'fingerPrint': (fingerPrint).toString()
-                            });
-                        await CRUD().post(
-                            link:
-                                "${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
-                            payload: {
-                              'token': box.read(BoxName.tokenDriver),
-                              'captain_id':
-                                  box.read(BoxName.driverID).toString(),
-                              'fingerPrint': (fingerPrint).toString()
-                            });
+
                         Get.back();
                       }));
             }

lib/controller/auth/captin/phone_helper_controller.dart

@@ -1,15 +1,14 @@
 import 'package:get/get.dart';
 import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
 import 'package:sefer_driver/controller/functions/crud.dart';
-import 'package:sefer_driver/views/auth/captin/cards/syrian_card_a_i.dart';
+import 'package:sefer_driver/print.dart';
 import 'package:sefer_driver/views/home/on_boarding_page.dart';
 import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 
 import '../../../constant/box_name.dart';
 import '../../../constant/links.dart';
 import '../../../main.dart';
-import '../../../print.dart';
-import '../../../views/auth/captin/otp_page.dart';
+import '../../../views/auth/syria/registration_view.dart';
 
 // --- Helper Class for Phone Authentication ---
 
@@ -27,9 +26,9 @@ class PhoneAuthHelper {
         link: _sendOtpUrl,
         payload: {'receiver': phoneNumber},
       );
-      Log.print('response: ${response}');
       if (response != 'failure') {
         final data = (response);
+        Log.print('data: ${data}');
         // if (data['status'] == 'success') {
         mySnackbarSuccess('An OTP has been sent to your WhatsApp number.'.tr);
         return true;
@@ -42,7 +41,6 @@ class PhoneAuthHelper {
         return false;
       }
     } catch (e) {
-      Log.print('e: ${e}');
       // mySnackeBarError('An error occurred: $e');
       return false;
     }
@@ -61,17 +59,14 @@ class PhoneAuthHelper {
 
         if (data['status'] == 'success') {
           final isRegistered = data['message']['isRegistered'] ?? false;
-          Log.print('isRegistered: ${isRegistered}');
           box.write(BoxName.phoneVerified, true);
           box.write(BoxName.phoneDriver, phoneNumber);
           box.write(BoxName.driverID, data['message']['driverID']);
-          Log.print('BoxName.driverID: ${box.read(BoxName.driverID)}');
 
           if (isRegistered) {
             // ✅ السائق مسجل مسبقًا - سجل دخوله واذهب إلى الصفحة الرئيسية
             final driver = data['message']['driver'];
             // mySnackbarSuccess('Welcome back, ${driver['first_name']}!');
-            Log.print('Welcome: }');
 
             // حفظ بيانات السائق إذا أردت:
             box.write(BoxName.driverID, driver['id']);
@@ -82,7 +77,8 @@ class PhoneAuthHelper {
           } else {
             // ✅ رقم الهاتف تم التحقق منه لكن السائق غير مسجل
             // mySnackbarSuccess('Phone verified. Please complete registration.');
-            Get.to(() => SyrianCardAI());
+            // Get.offAll(() => SyrianCardAI());
+            Get.offAll(() => RegistrationView());
           }
         } else {
           mySnackeBarError(data['message'] ?? 'Verification failed.');
@@ -92,7 +88,6 @@ class PhoneAuthHelper {
       }
     } catch (e) {
       mySnackeBarError('An error occurred: $e');
-      Log.print('e: ${e}');
     }
   }
 
@@ -121,7 +116,6 @@ class PhoneAuthHelper {
             "User with this phone number or email already exists.".tr);
       }
     } catch (e) {
-      Log.print('e: ${e}');
       mySnackeBarError('An error occurred: $e');
     }
   }

lib/controller/auth/captin/register_captin_controller.dart

@@ -2,8 +2,6 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
-import 'package:sefer_driver/views/auth/captin/cards/syrian_card_a_i.dart';
-import 'package:sefer_driver/views/auth/captin/register_captin.dart';
 import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -17,9 +15,8 @@ import 'package:sefer_driver/views/auth/captin/verify_email_captain.dart';
 
 import '../../../constant/colors.dart';
 import '../../../views/auth/captin/ai_page.dart';
-import '../../../views/auth/captin/car_license_page.dart';
+import '../../../views/auth/syria/registration_view.dart';
 import '../../../views/home/Captin/home_captain/home_captin.dart';
-import '../../functions/encrypt_decrypt.dart';
 import '../../functions/sms_egypt_controller.dart';
 
 class RegisterCaptainController extends GetxController {
@@ -282,7 +279,8 @@ class RegisterCaptainController extends GetxController {
         //         box.read(BoxName.driverID).toString(),
         //         box.read(BoxName.emailDriver).toString(),
         //       );
-        Get.to(SyrianCardAI());
+        // Get.offAll(() => SyrianCardAI());
+        Get.offAll(() => RegistrationView());
         // } else {
         // Get.snackbar('title', 'message');
         // }