25-10-2/1

lib/controller/auth/token_otp_change_controller.dart

@@ -9,6 +9,7 @@ import 'package:get/get.dart';
 import '../../print.dart';
 import '../../views/home/map_page_passenger.dart';
 import '../firebase/firbase_messge.dart';
+import '../functions/package_info.dart';
 
 class OtpVerificationController extends GetxController {
   final String phone;
@@ -49,6 +50,7 @@ class OtpVerificationController extends GetxController {
   }
 
   Future<void> sendOtp() async {
+    if (isLoading.value) return;
     isLoading.value = true;
     try {
       final response = await CRUD().post(
@@ -60,48 +62,60 @@ class OtpVerificationController extends GetxController {
       );
 
       if (response != 'failure') {
+        isLoading.value = true;
         // بإمكانك عرض رسالة نجاح هنا
       } else {
-        // Get.snackbar('Error', 'Failed to send OTP');
+        Get.snackbar('Error'.tr, 'Failed to send OTP'.tr);
       }
     } catch (e) {
       Get.snackbar('Error', e.toString());
     } finally {
-      isLoading.value = false;
+      // isLoading.value = false;
     }
   }
 
   Future<void> verifyOtp(String ptoken) async {
     isVerifying.value = true;
-    var finger = await storage.read(key: BoxName.fingerPrint);
+
     try {
+      String fingerPrint = await DeviceHelper.getDeviceFingerprint();
       final response = await CRUD().post(
         link: '${AppLink.server}/auth/token_passenger/verify_otp.php',
         payload: {
           'phone_number': phone,
           'otp': otpCode.value,
           'token': box.read(BoxName.tokenFCM).toString(),
-          'fingerPrint': finger.toString(),
+          'fingerPrint': fingerPrint.toString(),
         },
       );
 
       if (response != 'failure' && response['status'] == 'success') {
-        Get.back(); // توجه إلى الصفحة التالية
-        await Get.put(FirebaseMessagesController()).sendNotificationToDriverMAP(
+        final fcm = Get.isRegistered<FirebaseMessagesController>()
+            ? Get.find<FirebaseMessagesController>()
+            : Get.put(FirebaseMessagesController());
+
+        await fcm.sendNotificationToDriverMAP(
           'token change',
           'change device'.tr,
           ptoken.toString(),
           [],
           'cancel.wav',
         );
-        CRUD().post(
-            link:
-                '${AppLink.seferPaymentServer}/auth/token/update_passenger_token.php',
+        await CRUD().post(
+            link: "${AppLink.seferPaymentServer}/ride/firebase/add.php",
             payload: {
-              'token': box.read(BoxName.tokenDriver).toString(),
-              'fingerPrint': finger.toString(),
+              'token': (box.read(BoxName.tokenFCM.toString())),
               'passengerID': box.read(BoxName.passengerID).toString(),
+              "fingerPrint": fingerPrint.toString(),
             });
+        // CRUD().post(
+        //     link:
+        //         '${AppLink.seferPaymentServer}/auth/token/update_passenger_token.php',
+        //     payload: {
+        //       'token': box.read(BoxName.tokenFCM).toString(),
+        //       'fingerPrint': fingerPrint.toString(),
+        //       'passengerID': box.read(BoxName.passengerID).toString(),
+        //     });
         Get.offAll(() => const MapPagePassenger());
       } else {
         Get.snackbar('Verification Failed', 'OTP is incorrect or expired');