9/11/2

android/app/build.gradle

@@ -54,8 +54,8 @@ android {
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = 23
         targetSdk = flutter.targetSdkVersion
-        versionCode = 84
-        versionName = '1.5.84'
+        versionCode = 85
+        versionName = '1.5.85'
         multiDexEnabled =true
     }
 

lib/controller/home/captin/map_driver_controller.dart

@@ -705,7 +705,7 @@ class MapDriverController extends GetxController {
       await Future.delayed(const Duration(seconds: 1));
       recentDistanceToDash = Get.find<LocationController>().totalDistance;
       // rideTimerFromBegin = i;
-      if (int.parse(duration) > i) {
+      if (int.parse(duration) + 300 > i) {
         price = double.parse(totalCost);
       } else {
         if (startNameLocation.toLowerCase().contains('airport') ||
@@ -820,13 +820,10 @@ class MapDriverController extends GetxController {
                       ? (i ~/ 60) *
                               (Get.find<HomeCaptainController>().latePrice +
                                   .5) +
-                          (recentDistanceToDash *
-                              Get.find<HomeCaptainController>().comfortPrice)
-                      : (i ~/ 60) *
-                              (Get.find<HomeCaptainController>().latePrice +
-                                  .5) +
-                          (recentDistanceToDash *
-                              Get.find<HomeCaptainController>().mashwariPrice);
+                          (price) -
+                          int.parse(duration) *
+                              (Get.find<HomeCaptainController>().latePrice + .5)
+                      : price;
         } else if (currentTime.hour >= 14 && currentTime.hour <= 17) {
           price = carType == 'Comfort' // || carType == 'Free Ride'
               ? (i ~/ 60) * (Get.find<HomeCaptainController>().heavyPrice) +