11/15/1

lib/controller/home/map_passenger_controller.dart

@@ -73,9 +73,9 @@ class MapPassengerController extends GetxController {
   int selectedPassengerCount = 1;
   double progress = 0;
   double progressTimerToPassengerFromDriverAfterApplied = 0;
-  int durationTimer = 15;
+  int durationTimer = 25;
   late int durationToRide;
-  int remainingTime = 15;
+  int remainingTime = 25;
   int remainingTimeToPassengerFromDriverAfterApplied = 60;
   int timeToPassengerFromDriverAfterApplied = 0;
   Timer? timerToPassengerFromDriverAfterApplied;
@@ -353,7 +353,7 @@ class MapPassengerController extends GetxController {
         print(decod['data']);
         if (decod['data'].toString() == 'Apply') {
           shouldFetch = false; // Stop further fetches
-          rideConfirm = false;
+          // rideConfirm = false;
           update();
           startTimer();
         } else if (decod['data'].toString() == 'Refused') {
@@ -438,6 +438,7 @@ class MapPassengerController extends GetxController {
       //           markerReloadingTimer.cancel();
       //         }));
     } else {
+      noCarString = false;
       dataCarsLocationByPassenger = jsonDecode(res);
       // print(dataCarsLocationByPassenger);
       driverId = dataCarsLocationByPassenger['message'][carsOrder]['driver_id']
@@ -448,6 +449,7 @@ class MapPassengerController extends GetxController {
             double.parse(dataCarsLocationByPassenger['message'][i]['latitude']),
             double.parse(
                 dataCarsLocationByPassenger['message'][i]['longitude'])));
+        update();
       }
 
       update();
@@ -528,7 +530,7 @@ class MapPassengerController extends GetxController {
   }
 
   Future cancelRide() async {
-    print(rideConfirm);
+    print("rideConfirm=$rideConfirm");
 
     if (rideConfirm == false) {
       clearPlaces();
@@ -545,19 +547,17 @@ class MapPassengerController extends GetxController {
       clearPlaces();
       clearPolyline();
       data = [];
+      await CRUD().post(link: AppLink.updateDriverOrder, payload: {
+        "order_id": rideId.toString(), // Convert to String
+        "status": 'Cancel'
+      });
       rideConfirm = false;
       shouldFetch = false;
       isPassengerChosen = false;
       isCashSelectedBeforeConfirmRide = false;
       timeToPassengerFromDriverAfterApplied = 0;
       changeCancelRidePageShow();
-      remainingTime = 25;
-      update();
-
-      await CRUD().post(link: AppLink.updateDriverOrder, payload: {
-        "order_id": rideId.toString(), // Convert to String
-        "status": 'Cancel'
-      });
+      remainingTime = 0;
 
       update();
     }