1/23/1

lib/controller/home/captin/map_driver_controller.dart

@@ -6,6 +6,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
+import 'package:ride/constant/style.dart';
+import 'package:ride/views/widgets/elevated_btn.dart';
 
 import '../../../constant/api_key.dart';
 import '../../../constant/box_name.dart';
@@ -72,6 +74,7 @@ class MapDriverController extends GetxController {
   late Timer timer;
   String? mapAPIKEY;
   final zones = <Zone>[];
+  String canelString = 'yet';
 
   void onMapCreated(GoogleMapController controller) async {
     myLocation = Get.find<LocationController>().location as LatLng;
@@ -257,7 +260,6 @@ class MapDriverController extends GetxController {
         tokenPassenger);
   }
 
-  String canelString = '';
   void cancelCheckRidefromPassenger() async {
     var res = await CRUD().get(link: AppLink.getOrderCancelStatus, payload: {
       'order_id': rideId,
@@ -265,10 +267,9 @@ class MapDriverController extends GetxController {
     print('Cancel fetch--------------------');
     var response = jsonDecode(res);
     canelString = response['data']['status'];
+    print('cancel is $canelString');
     update();
-    if (response['data']['status'].toString() == 'Cancel') {
-      Get.snackbar('Order Cancelled'.tr, 'Order Cancelled by Passenger'.tr,
-          backgroundColor: AppColor.redColor);
+    if (canelString == 'Cancel') {
       remainingTimeTimerRideBegin = 0;
       remainingTimeToShowPassengerInfoWindowFromDriver = 0;
       remainingTimeToPassenger = 0;
@@ -277,6 +278,18 @@ class MapDriverController extends GetxController {
       isPassengerInfoWindow = false;
       clearPolyline();
       update();
+      Get.defaultDialog(
+        title: 'Order Cancelled'.tr,
+        titleStyle: AppStyle.title,
+        middleText: 'Order Cancelled by Passenger'.tr,
+        middleTextStyle: AppStyle.title,
+        confirm: MyElevatedButton(
+          title: 'Ok'.tr,
+          onPressed: () {
+            Get.offAll(HomeCaptain());
+          },
+        ),
+      );
     }
   }