4/7/10

lib/controller/home/map_passenger_controller.dart

@@ -116,6 +116,7 @@ class MapPassengerController extends GetxController {
   bool startLocationFromMap4 = false;
   List startLocationFromMapAll = [];
   double latePrice = 0;
+  double fuelPrice = 0;
   double heavyPrice = 0;
   double naturePrice = 0;
   bool heightMenuBool = false;
@@ -2438,12 +2439,17 @@ class MapPassengerController extends GetxController {
 
   double passengerRate = 5;
   getKazanPercent() async {
-    var res = await CRUD().get(link: AppLink.getKazanPercent);
+    var res = await CRUD().get(
+      link: AppLink.getKazanPercent,
+      payload: {'country': box.read(BoxName.countryCode).toString()},
+    );
     if (res != 'failure') {
+      // print(jsonDecode(res));
       kazan = double.parse(jsonDecode(res)['message'][0]['kazan']);
       naturePrice = double.parse(jsonDecode(res)['message'][0]['naturePrice']);
       heavyPrice = double.parse(jsonDecode(res)['message'][0]['heavyPrice']);
       latePrice = double.parse(jsonDecode(res)['message'][0]['latePrice']);
+      fuelPrice = double.parse(jsonDecode(res)['message'][0]['fuelPrice']);
     }
   }
 
@@ -2452,7 +2458,7 @@ class MapPassengerController extends GetxController {
         link: AppLink.getPassengerRate,
         payload: {'passenger_id': box.read(BoxName.passengerID)});
     if (res != 'failure') {
-      passengerRate = jsonDecode(res)['message']['rating'];
+      passengerRate = jsonDecode(res)['message']['rating'].toDouble();
     }
   }
 

lib/controller/notification/notification_captain_controller.dart

@@ -47,6 +47,15 @@ class NotificationCaptainController extends GetxController {
     );
   }
 
+  addNotificationCaptain(String driverId, title, body, isPin) async {
+    await CRUD().post(link: AppLink.addNotificationCaptain, payload: {
+      'driverID': driverId,
+      'title': title,
+      'body': body,
+      'isPin': isPin
+    });
+  }
+
   @override
   void onInit() {
     getNotifications();

lib/views/home/map_widget.dart/ride_begin_passenger.dart

@@ -113,8 +113,6 @@ class RideBeginPassenger extends StatelessWidget {
                       CircleAvatar(
                         radius: 30,
                         backgroundImage: NetworkImage(
-                            //   '',
-                            // ),
                             'https://ride.mobile-app.store/portrate_captain_image/${controller.driverId}.jpg'),
                       ),
                       Text(
@@ -127,10 +125,6 @@ class RideBeginPassenger extends StatelessWidget {
                             '${controller.driverRate} 📈',
                             style: AppStyle.title,
                           ),
-                          // Text(
-                          //   '${controller.rideStatusFromStartApp['data']['carType']}',
-                          //   style: AppStyle.title,
-                          // ),
                         ],
                       ),
                     ],

lib/views/home/map_widget.dart/ride_from_start_app.dart

@@ -42,8 +42,6 @@ class RideFromStartApp extends StatelessWidget {
                                 style: AppStyle.title,
                               ),
                               Text(
-                                // controller.rideStatusFromStartApp['data']
-                                //     ['endtime'],
                                 box.read(BoxName.arrivalTime),
                                 style: AppStyle.title,
                               ),

lib/views/home/profile/passenger_profile_page.dart

@@ -307,7 +307,7 @@ class CountryPicker extends StatelessWidget {
   final List<String> countryOptions = [
     'Jordan'.tr,
     'USA'.tr,
-    'Egypt'.tr,
+    'Eygpt'.tr,
     'Turkey'.tr,
     'Saudi Arabia'.tr,
     'Qatar'.tr,