10/3/1

lib/controller/home/map_page_controller.dart

@@ -168,6 +168,7 @@ class MapController extends GetxController {
   }
 
   var rideId;
+  late String driverToken;
   int carsOrder = 0;
   changeConfirmRide() async {
     PaymentController paymentController = Get.find<PaymentController>();
@@ -175,6 +176,8 @@ class MapController extends GetxController {
     shouldFetch = true;
     isBottomSheetShown = false;
     timeToPassengerFromDriverAfterApplied = 60;
+    driverToken =
+        dataCarsLocationByPassenger['message'][carsOrder]['token'].toString();
     update();
     // print('rideConfirm= $rideConfirm');
 
@@ -189,7 +192,8 @@ class MapController extends GetxController {
       "endtime": durationToAdd.toString(),
       "price": totalPassenger.toString(),
       "passenger_id": box.read(BoxName.pasengerID).toString(),
-      "driver_id": dataCarsLocationByPassenger['message'][0]['id'].toString(),
+      "driver_id":
+          dataCarsLocationByPassenger['message'][carsOrder]['id'].toString(),
       "status": "waiting",
       "price_for_driver": totalDriver.toString(),
       "price_for_passenger": totalME.toString(),
@@ -214,9 +218,10 @@ class MapController extends GetxController {
         box.read(BoxName.phone).toString(),
         durationByPassenger.toString(),
         distanceByPassenger.toString(),
-        paymentController.isWalletChecked.toString()
+        paymentController.isWalletChecked.toString(),
+        dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(),
       ];
-      FirebasMessagesController().sendNotificationToDriverMAP(
+      FirebaseMessagesController().sendNotificationToDriverMAP(
         'Order',
         jsonDecode(value)['message'].toString(),
         dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(),
@@ -410,6 +415,7 @@ class MapController extends GetxController {
       changeCancelRidePageShow();
       rideConfirm = false;
       shouldFetch = false;
+      timeToPassengerFromDriverAfterApplied = 0;
       update();
     } else {
       clearPlaces();
@@ -417,12 +423,13 @@ class MapController extends GetxController {
       data = [];
       rideConfirm = false;
       shouldFetch = false;
+      timeToPassengerFromDriverAfterApplied = 0;
       changeCancelRidePageShow();
       remainingTime = 25;
       update();
 
       await CRUD().post(link: AppLink.addCancelRideFromPassenger, payload: {
-        "driverID": FirebasMessagesController()
+        "driverID": FirebaseMessagesController()
             .driverID
             .toString(), // Convert to String
         "passengerID":