10/12/1

lib/views/orderCaptin/driver_map_page.dart

@@ -19,7 +19,6 @@ class PassengerLocationDirection extends StatelessWidget {
   Widget build(BuildContext context) {
     Get.put(MapDriverController());
 
-    // mapDirection.getMap();//todo get this argument
     return MyScafolld(
         title: 'Map'.tr,
         body: [
@@ -72,7 +71,7 @@ class PassengerLocationDirection extends StatelessWidget {
           const PassengerInfoWindow(),
           GetBuilder<MapDriverController>(
               builder: (mapDriverController) => mapDriverController
-                      .isRideFinished
+                      .isRideStarted
                   ? Positioned(
                       left: 5,
                       top: 5,
@@ -97,7 +96,9 @@ class PassengerLocationDirection extends StatelessWidget {
                             ),
                             MyElevatedButton(
                               title: 'End Ride'.tr,
-                              onPressed: () {},
+                              onPressed: () {
+                                mapDriverController.finishRideFromDriver();
+                              },
                               kolor: AppColor.redColor,
                             ),
                             Column(

lib/views/orderCaptin/order_request_page.dart

@@ -199,6 +199,8 @@ class OrderRequestPage extends StatelessWidget {
                               'https://www.google.com/maps/dir/${myList[0]}/${myList[1]}/',
                           'DurationToPassenger': myList[15].toString(),
                           'rideId': myList[16].toString(),
+                          'passengerId': myList[7].toString(),
+                          'driverId': myList[18].toString(),
                         });
                       },
                     ),