26-1-22/1

lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart

@@ -103,7 +103,7 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
                   // Get.snackbar(
                   //     '${'Please wait'.tr} $minutesLeft ${"minutes before trying again.".tr}',
                   //     '');
-                  NotificationController1().showNotification(
+                  NotificationController().showNotification(
                       'Intaleq Driver'.tr,
                       '${'Please wait'.tr} $minutesLeft ${"minutes before trying again.".tr}',
                       'ding',

lib/views/home/Captin/orderCaptin/order_over_lay.dart

@@ -216,29 +216,15 @@ class _OrderOverlayState extends State<OrderOverlay>
         await _closeOverlay();
         return;
       }
-      var res = await CRUD().post(
-          link: "${AppLink.ride}/rides/updateStausFromSpeed.php",
-          payload: {
-            'id': orderData!.orderId,
-            'rideTimeStart': DateTime.now().toString(),
-            'status': 'Apply',
-            'driver_id': box.read(BoxName.driverID),
-          });
-      List<String> bodyToPassenger = [
-        _getData(6).toString(),
-        _getData(8).toString(),
-        _getData(9).toString(),
-      ];
+      var res = await CRUD()
+          .post(link: "${AppLink.ride}/rides/acceptRide.php", payload: {
+        'id': orderData!.orderId,
+        'rideTimeStart': DateTime.now().toString(),
+        'status': 'Apply',
+        'driver_id': box.read(BoxName.driverID),
+        'passengerToken': _getData(9),
+      });
 
-      NotificationService.sendNotification(
-        target: _getData(9).toString(),
-        title: "Accepted Ride".tr,
-        body: 'your ride is Accepted'.tr,
-        isTopic: false, // Important: this is a token
-        tone: 'start',
-        driverList: bodyToPassenger,
-        category: 'Accepted Ride',
-      );
       final payload = {
         // بيانات أساسية
         'driver_id': driverId,
@@ -275,7 +261,6 @@ class _OrderOverlayState extends State<OrderOverlay>
         'timeOfOrder': DateTime.now().toIso8601String(),
         'totalPassenger': _getData(2),
       };
-      Log.print('myList: ${myList}');
       Log.print('payload: ${payload}');
       CRUD().post(
         link: AppLink.addOverLayStatus,
@@ -283,11 +268,6 @@ class _OrderOverlayState extends State<OrderOverlay>
       );
       if (res != "failure") {
         // Using rideId (_getData(16)) for order_id consistently
-        CRUD().post(link: AppLink.addDriverOrder, payload: {
-          'driver_id': driverId, // Driver ID from the order data
-          'order_id': orderData!.orderId,
-          'status': 'Apply'
-        });
 
         _log("Server update successful. Writing to storage.");
         notificationController.showNotification(