4/4/2

lib/controller/auth/captin/history_captain.dart

@@ -23,10 +23,14 @@ class HistoryCaptainController extends GetxController {
     var res = await CRUD().get(
         link: AppLink.getDriverOrder,
         payload: {'driver_id': box.read(BoxName.driverID)});
-    historyData = jsonDecode(res);
-    print(historyData);
-    isloading = false;
-    update();
+    if (res != 'failure') {
+      historyData = jsonDecode(res);
+      print(historyData);
+      isloading = false;
+      update();
+    } else {
+      Get.defaultDialog(title: 'Not found');
+    }
   }
 
   getHistoryDetails(String orderId) async {

lib/controller/home/map_passenger_controller.dart

@@ -2345,7 +2345,7 @@ class MapPassengerController extends GetxController {
         link: AppLink.getPassengerRate,
         payload: {'passenger_id': box.read(BoxName.passengerID)});
     if (res != 'failure') {
-      passengerRate = double.parse(jsonDecode(res)['message']['rating']);
+      passengerRate = jsonDecode(res)['message']['rating'];
     }
   }
 
@@ -2354,6 +2354,11 @@ class MapPassengerController extends GetxController {
     mapAPIKEY = await storage.read(key: BoxName.mapAPIKEY);
     getFavioratePlaces();
     readyWayPoints();
+    addCustomPicker();
+    addCustomCarIcon();
+    addCustomStepIcon();
+    addCustomStartIcon();
+    addCustomEndIcon();
     await getLocation();
     await addToken();
     await getKazanPercent();
@@ -2361,11 +2366,6 @@ class MapPassengerController extends GetxController {
     startMarkerReloading();
     // await getCarsLocationByPassenger();
     // await getNearestDriverByPassengerLocation();
-    addCustomPicker();
-    addCustomCarIcon();
-    addCustomStepIcon();
-    addCustomStartIcon();
-    addCustomEndIcon();
 
     initilizeGetStorage();
     cardNumber = await SecureStorage().readData(BoxName.cardNumber);

lib/controller/local/translations.dart

@@ -478,10 +478,12 @@ class MyTranslation extends Translations {
           'Distance from Passenger to destination is ':
               "المسافة من الراكب إلى الوجهة هي ",
           'Cost Of Trip IS ': "تكلفة الرحلة هي ",
+          'No ride found yet': '‏لا يوجد طلبات متوفرة حاليا',
           'Accept Order': "‏اقبل الطلب",
           'reject your order.': "رفض طلبك.",
           'Bottom Bar Example': "مثال لشريط الأسفل",
-          'Statistics': "الإحصائيات",'Available for rides':'‏مشاوير متاحة',
+          'Statistics': "الإحصائيات",
+          'Available for rides': '‏مشاوير متاحة',
           'Scan Id': "مسح الهوية",
           'Camera not initilaized yet': "الكاميرا لم تُثبت بعد",
           'Scan ID MklGoogle': "مسح هوية MklGoogle",