4/1/1

lib/controller/home/captin/order_request_controller.dart

@@ -97,14 +97,14 @@ class OrderRequestController extends GetxController {
 
       update();
     }
-    if (remainingTimeSpeed == 0) {
-      if (applied == false) {
-        print('applied=========================');
-        print(applied);
-        Get.back();
-        // refuseOrder(box.read(BoxName.driverID), orderID);
-      }
-    }
+    // if (remainingTimeSpeed == 0) {
+    // if (applied == false) {
+    //   print('applied=========================');
+    //   print(applied);
+    //   Get.back();
+    //   // refuseOrder(box.read(BoxName.driverID), orderID);
+    // }
+    // }
   }
 
   void refuseOrder(orderID) async {

lib/controller/home/map_passenger_controller.dart

@@ -471,7 +471,7 @@ class MapPassengerController extends GetxController {
 
     // Format the message.
     String message =
-        '${'${'Hi! This is'.tr} ${box.read(BoxName.name)}.\n${' I am using'.tr}'} ${box.read(AppInformation.appName)}${' to ride with'.tr} $firstName${' as the driver.'.tr} $firstName \n${'is driving a '.tr}$model\n${' with license plate '.tr}$licensePlate.\n${' I am currently located at '.tr}$passengerLocation.\n${' If you need to reach me, please contact the driver directly at'.tr}\n\n $driverPhone.';
+        '${'${'Hi! This is'.tr} ${box.read(BoxName.name)}.\n${' I am using'.tr}'} ${AppInformation.appName}${' to ride with'.tr} $firstName${' as the driver.'.tr} $firstName \n${'is driving a '.tr}$model\n${' with license plate '.tr}$licensePlate.\n${' I am currently located at '.tr} https://www.google.com/maps/place/${passengerLocation.latitude},${passengerLocation.longitude}.\n${' If you need to reach me, please contact the driver directly at'.tr}\n\n $driverPhone.';
 
     // Launch the URL to send the SMS.
     launchCommunication('whatsapp', to, message);
@@ -1199,18 +1199,16 @@ class MapPassengerController extends GetxController {
   }
 
   void reloadMarkerDriverCarsLocationToPassengerAfterApplied() {
-    // Clear existing markers
-    // markers.clear();
-    // update();
     clearMarkersExceptStartEnd();
     // for (var i = 0; i < driverCarsLocationToPassengerAfterApplied.length; i++) {
+    LatLng driverPosition = LatLng(
+        double.parse(
+            datadriverCarsLocationToPassengerAfterApplied[0]['latitude']),
+        double.parse(
+            datadriverCarsLocationToPassengerAfterApplied[0]['longitude']));
     final driverAcceptedMarker = Marker(
       markerId: const MarkerId('driverToPassengers'),
-      position: LatLng(
-          double.parse(
-              datadriverCarsLocationToPassengerAfterApplied[0]['latitude']),
-          double.parse(
-              datadriverCarsLocationToPassengerAfterApplied[0]['longitude'])),
+      position: driverPosition,
       rotation: double.parse(
           datadriverCarsLocationToPassengerAfterApplied['message'][0]
               ['heading']),
@@ -1218,9 +1216,7 @@ class MapPassengerController extends GetxController {
     );
     markers.add(driverAcceptedMarker);
     // update();
-    mapController?.animateCamera(CameraUpdate.newLatLng(LatLng(
-        driverCarsLocationToPassengerAfterApplied[0].latitude,
-        driverCarsLocationToPassengerAfterApplied[0].longitude)));
+    mapController?.animateCamera(CameraUpdate.newLatLng(driverPosition));
     update();
     // } // Update the map with the new markers
   }

lib/controller/local/translations.dart

@@ -458,7 +458,12 @@ class MyTranslation extends Translations {
           'Are you sure to cancel?': "هل أنت متأكد من الإلغاء؟",
           'Yes': 'نعم',
           'Insert Emergincy Number': "أدخل رقم الطوارئ",
-          'Insert': "إدراج",'You can decline a request without any cost':'‏يمكنك إلغاء الطلب بدون أي تكلفة',
+          'Best choice for comfort car and flexible route and stops point': 'أفضل اختيار لسيارة مريحة ومسار مرن ونقاط توقف',
+          'Insert': "إدراج",'This is for delivery or a motorcycle.':"هذا للتسليم أو الدراجة النارية",
+          'This trip goes directly from your starting point to your destination for a fixed price. The driver must follow the planned route':'الرحلة دي من نقطة البداية لنقطة النهاية بسعر ثابت والسواق لازم يمشي بنفس الطريق.',
+          'You can decline a request without any cost':
+              '‏يمكنك إلغاء الطلب بدون أي تكلفة',
+              'Perfect for adventure seekers who want to experience something new and exciting':'خيار مثالي لللي عايزين يخرجوا من الروتين ويجربوا حاجات جديدة ومثيرة',
           " My current location is:": "موقعي الحالي هو:",
           " \nand I have a trip on": "\nولدي رحلة على",
           "App \nwith Passenger ": "التطبيق\nمع الراكب ",