4/7/11

lib/controller/home/captin/home_captain_controller.dart

@@ -28,7 +28,11 @@ class HomeCaptainController extends GetxController {
   late double kazan;
   double latePrice = 0;
   double heavyPrice = 0;
-  double comfortPrice = 0, speedPrice = 0, deliveryPrice = 0, mashwariPrice = 0;
+  double comfortPrice = 0,
+      speedPrice = 0,
+      deliveryPrice = 0,
+      mashwariPrice = 0,
+      fuelPrice = 0;
   double naturePrice = 0;
   bool isCallOn = false;
   String totalMoneyToday = '0';
@@ -256,6 +260,7 @@ class HomeCaptainController extends GetxController {
       deliveryPrice =
           double.parse(jsonDecode(res)['message'][0]['deliveryPrice']);
       mashwariPrice = double.parse(jsonDecode(res)['message'][0]['freePrice']);
+      fuelPrice = double.parse(jsonDecode(res)['message'][0]['fuelPrice']);
     }
   }
 

lib/controller/home/captin/map_driver_controller.dart

@@ -836,6 +836,13 @@ class MapDriverController extends GetxController {
     update();
   }
 
+  double mpg = 0;
+  calculateConsumptionFuel() {
+    mpg = Get.find<HomeCaptainController>().fuelPrice /
+        12; //todo in register car add mpg in box
+    update();
+  }
+
   late Duration durationToAdd;
   int hours = 0;
   int minutes = 0;
@@ -910,6 +917,7 @@ class MapDriverController extends GetxController {
     durationToAdd = Duration(seconds: int.parse(duration));
     hours = durationToAdd.inHours;
     minutes = (durationToAdd.inMinutes % 60).round();
+    calculateConsumptionFuel();
     // cancelCheckRidefromPassenger();
     // checkIsDriverNearPassenger();
     super.onInit();

lib/controller/home/map_passenger_controller.dart

@@ -2458,7 +2458,9 @@ class MapPassengerController extends GetxController {
         link: AppLink.getPassengerRate,
         payload: {'passenger_id': box.read(BoxName.passengerID)});
     if (res != 'failure') {
-      passengerRate = jsonDecode(res)['message']['rating'].toDouble();
+      passengerRate = jsonDecode(res)['message']['rating'] == null
+          ? 5
+          : jsonDecode(res)['message']['rating'].toDouble();
     }
   }
 

lib/views/home/Captin/orderCaptin/order_request_page.dart

@@ -79,7 +79,13 @@ class OrderRequestPage extends StatelessWidget {
       endIcon = value;
     });
     // }
+    double mpg = 0;
+    calculateConsumptionFuel() {
+      mpg = Get.find<HomeCaptainController>().fuelPrice /
+          12; //todo in register car add mpg in box
+    }
 
+    calculateConsumptionFuel();
     return MyScafolld(
         title: 'Order Details'.tr,
         body: [
@@ -278,7 +284,8 @@ class OrderRequestPage extends StatelessWidget {
                         style: AppStyle.title,
                         children: [
                           TextSpan(
-                              text: double.parse(myList[26]).toStringAsFixed(2),
+                              text: (mpg * double.parse(myList[5]))
+                                  .toStringAsFixed(2),
                               style: AppStyle.headTitle2),
                         ],
                       ),

lib/views/home/Captin/orderCaptin/order_speed_request.dart

@@ -81,6 +81,11 @@ class OrderSpeedRequest extends StatelessWidget {
       endIcon = value;
     });
     // }
+    double mpg = 0;
+    calculateConsumptionFuel() {
+      mpg = Get.find<HomeCaptainController>().fuelPrice /
+          12; //todo in register car add mpg in box
+    }
 
     return MyScafolld(
         title: 'Order Details'.tr,
@@ -287,7 +292,8 @@ class OrderSpeedRequest extends StatelessWidget {
                       style: AppStyle.title,
                       children: [
                         TextSpan(
-                            text: double.parse(myList[26]).toStringAsFixed(2),
+                            text: (mpg * double.parse(myList[5]))
+                                .toStringAsFixed(2),
                             style: AppStyle.headTitle2),
                       ],
                     ),