12/1/1
This commit is contained in:
@@ -173,19 +173,20 @@ class MapDriverController extends GetxController {
|
||||
|
||||
cancelTripFromDriverAfterApplied() async {
|
||||
if (formKeyCancel.currentState!.validate()) {
|
||||
FirebaseMessagesController().sendNotificationToDriverMAP(
|
||||
"Cancel Trip from driver",
|
||||
"Trip Cancelled from driver. We are looking for a new driver. Please wait."
|
||||
.tr,
|
||||
tokenPassenger,
|
||||
[],
|
||||
'cancel.wav',
|
||||
);
|
||||
await CRUD().post(
|
||||
link: "${AppLink.seferCairoServer}/ride/rides/update.php",
|
||||
payload: {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'CancelFromDriverAfterApply'
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
CRUD()
|
||||
.post(link: "${AppLink.endPoint}/ride/rides/update.php", payload: {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'CancelFromDriverAfterApply'
|
||||
});
|
||||
}
|
||||
await CRUD().post(
|
||||
link:
|
||||
"${AppLink.seferCairoServer}/ride/cancelRide/addCancelTripFromDriverAfterApplied.php",
|
||||
@@ -196,6 +197,11 @@ class MapDriverController extends GetxController {
|
||||
"notes": cancelTripCotroller.text.toString()
|
||||
});
|
||||
if (AppLink.endPoint != AppLink.seferCairoServer) {
|
||||
CRUD()
|
||||
.post(link: "${AppLink.endPoint}/ride/rides/update.php", payload: {
|
||||
"id": rideId.toString(), // Convert to String
|
||||
"status": 'CancelFromDriverAfterApply'
|
||||
});
|
||||
CRUD().post(
|
||||
link:
|
||||
"${AppLink.endPoint}/ride/cancelRide/addCancelTripFromDriverAfterApplied.php",
|
||||
@@ -206,14 +212,6 @@ class MapDriverController extends GetxController {
|
||||
"notes": cancelTripCotroller.text.toString()
|
||||
});
|
||||
}
|
||||
FirebaseMessagesController().sendNotificationToDriverMAP(
|
||||
"Cancel Trip from driver".tr,
|
||||
"Trip Cancelled from driver. We are looking for a new driver. Please wait."
|
||||
.tr,
|
||||
tokenPassenger,
|
||||
[],
|
||||
'cancel.wav',
|
||||
);
|
||||
|
||||
sql.insertData({
|
||||
'order_id': rideId,
|
||||
@@ -221,7 +219,7 @@ class MapDriverController extends GetxController {
|
||||
'driver_id': box.read(BoxName.driverID).toString(),
|
||||
}, TableName.driverOrdersRefuse);
|
||||
Get.find<HomeCaptainController>().getRefusedOrderByCaptain();
|
||||
Get.offAll(HomeCaptain());
|
||||
Get.offAll(() => HomeCaptain());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -550,21 +548,21 @@ class MapDriverController extends GetxController {
|
||||
Get.find<LocationController>().myLocation.longitude,
|
||||
);
|
||||
MyDialog().getDialog('Are you sure to exit ride ?'.tr, '', () {
|
||||
if (distanceToDestination > 900 ||
|
||||
(double.parse(distance.toString()) < 1000 &&
|
||||
distanceToDestination > 150)) {
|
||||
Get.back();
|
||||
finishRideFromDriver1();
|
||||
} else {
|
||||
Get.back();
|
||||
if (distanceToDestination <= 150) {
|
||||
// todo add scam from start point and dont move
|
||||
// finishRideFromDriver1();
|
||||
}
|
||||
MyDialog().getDialog('you are not moved yet !'.tr, '', () {
|
||||
Get.back();
|
||||
});
|
||||
}
|
||||
// if (distanceToDestination > 900 ||
|
||||
// (double.parse(distance.toString()) < 1000 &&
|
||||
// distanceToDestination > 150)) {
|
||||
Get.back();
|
||||
finishRideFromDriver1();
|
||||
// } else {
|
||||
// Get.back();
|
||||
// if (distanceToDestination <= 150) {
|
||||
// // todo add scam from start point and dont move
|
||||
// // finishRideFromDriver1();
|
||||
// }
|
||||
// MyDialog().getDialog('you are not moved yet !'.tr, '', () {
|
||||
// Get.back();
|
||||
// });
|
||||
// }
|
||||
});
|
||||
}
|
||||
|
||||
@@ -598,7 +596,7 @@ class MapDriverController extends GetxController {
|
||||
box.write(BoxName.rideStatus, 'Finished');
|
||||
// Get.find<HomeCaptainController>().changeToAppliedRide('Finished');
|
||||
// Get.find<HomeCaptainController>().update();
|
||||
totalCost = price < 30
|
||||
totalCost = price < 20
|
||||
? carType != 'Comfort' && carType != 'Mishwar Vip' && carType != 'Lady'
|
||||
? '20'
|
||||
: '30'
|
||||
@@ -662,7 +660,8 @@ class MapDriverController extends GetxController {
|
||||
}
|
||||
|
||||
double pointsSubtraction = 0;
|
||||
pointsSubtraction = double.parse(paymentAmount) * (-1);
|
||||
pointsSubtraction =
|
||||
double.parse(paymentAmount) * (-1) * .08; //for 300 from 3000
|
||||
var paymentToken2 =
|
||||
await generateTokenDriver((pointsSubtraction).toStringAsFixed(0));
|
||||
var res = await CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
|
||||
|
||||
Reference in New Issue
Block a user