4/4/3

lib/controller/auth/captin/history_captain.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:SEFER/views/widgets/elevated_btn.dart';
 import 'package:get/get.dart';
 
 import '../../../constant/box_name.dart';
@@ -29,7 +30,16 @@ class HistoryCaptainController extends GetxController {
       isloading = false;
       update();
     } else {
-      Get.defaultDialog(title: 'Not found');
+      Get.defaultDialog(
+          title: 'No ride yet'.tr,
+          middleText: '',
+          barrierDismissible: false,
+          confirm: MyElevatedButton(
+              title: 'Back'.tr,
+              onPressed: () {
+                Get.back();
+                Get.back();
+              }));
     }
   }
 

lib/controller/home/map_passenger_controller.dart

@@ -1246,6 +1246,8 @@ class MapPassengerController extends GetxController {
       "status": 'notApplyFromAnyDriver'
     });
     rideConfirm = false;
+    statusRide == 'Cancel';
+    isSearchingWindow = false;
     shouldFetch = false;
     isPassengerChosen = false;
     isCashConfirmPageShown = false;
@@ -1279,6 +1281,7 @@ class MapPassengerController extends GetxController {
       shouldFetch = false;
       isCashConfirmPageShown = false;
       isSearchingWindow = false;
+      statusRide = 'Cancel';
       isPassengerChosen = false;
       isCashSelectedBeforeConfirmRide = false;
       isPickerShown = false;
@@ -1308,6 +1311,7 @@ class MapPassengerController extends GetxController {
       isSearchingWindow = false;
       isPassengerChosen = false;
       isCashSelectedBeforeConfirmRide = false;
+      statusRide = 'Cancel';
       haveSteps = false;
       isMarkersShown = false;
       timeToPassengerFromDriverAfterApplied = 0;

lib/controller/notification/notification_captain_controller.dart

@@ -10,11 +10,11 @@ import '../../main.dart';
 import '../functions/crud.dart';
 
 class NotificationCaptainController extends GetxController {
-  bool isloading = false;
+  bool isLoading = false;
   Map notificationData = {};
 
   getNotifications() async {
-    isloading = true;
+    isLoading = true;
     update();
     var res = await CRUD().get(
         link: AppLink.getNotificationCaptain,
@@ -36,7 +36,7 @@ class NotificationCaptainController extends GetxController {
     // sql.insertData(notificationData['message'], TableName.captainNotification);
 
     // print(notificationData);
-    isloading = false;
+    isLoading = false;
     update();
   }