This commit is contained in:
Hamza-Ayed
2023-12-03 10:35:27 +03:00
parent e095cf564a
commit 2501292424
50 changed files with 1841 additions and 730 deletions

View File

@@ -347,7 +347,7 @@ class MapPassengerController extends GetxController {
}
void delayAndFetchRideStatus(String rideId) {
Timer(const Duration(seconds: 1), () async {
Timer(const Duration(milliseconds: 200), () async {
if (shouldFetch) {
// print('shouldFetch is =$shouldFetch');
var res = await CRUD()
@@ -357,13 +357,18 @@ 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') {
if (dataCarsLocationByPassenger.length > carsOrder) {
carsOrder++;
update();
carsOrder = carsOrder + 1;
update();
print(dataCarsLocationByPassenger['message'].length);
print(dataCarsLocationByPassenger['message']);
print(carsOrder);
if (carsOrder < dataCarsLocationByPassenger['message'].length) {
print('55555555555555555555');
changeConfirmRide();
} else {
Get.defaultDialog(
@@ -374,7 +379,7 @@ class MapPassengerController extends GetxController {
onPressed: () => Get.offAll(const MapPagePassenger()),
));
// cancelRide();
cancelRideAfterRejectFromAll();
}
} else {
delayAndFetchRideStatus(
@@ -548,6 +553,26 @@ class MapPassengerController extends GetxController {
update();
}
Future<void> cancelRideAfterRejectFromAll() async {
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;
isCashConfirmPageShown = false;
isCashSelectedBeforeConfirmRide = false;
timeToPassengerFromDriverAfterApplied = 0;
changeCancelRidePageShow();
remainingTime = 0;
update();
}
Future cancelRide() async {
print("rideConfirm=$rideConfirm");
@@ -558,8 +583,9 @@ class MapPassengerController extends GetxController {
changeCancelRidePageShow();
rideConfirm = false;
shouldFetch = false;
isCashSelectedBeforeConfirmRide = false;
isCashConfirmPageShown = false;
isPassengerChosen = false;
isCashSelectedBeforeConfirmRide = false;
timeToPassengerFromDriverAfterApplied = 0;
update();
} else {
@@ -573,6 +599,7 @@ class MapPassengerController extends GetxController {
rideConfirm = false;
shouldFetch = false;
isPassengerChosen = false;
isCashConfirmPageShown = false;
isCashSelectedBeforeConfirmRide = false;
timeToPassengerFromDriverAfterApplied = 0;
changeCancelRidePageShow();