From ef6d3604cdf08c62086d83a56d4b73106c1235f7 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <masahamdev@gmail.com>
Date: Sun, 3 Sep 2023 13:48:55 +0300
Subject: [PATCH] 9/3/1

---
 android/app/src/main/AndroidManifest.xml      |   2 +-
 ios/Runner/Info.plist                         | 102 ++++++------
 lib/constant/box_name.dart                    |   1 +
 lib/controller/firebase/firbase_messge.dart   | 132 ++++++++++++---
 lib/controller/functions/crud.dart            |   4 +-
 lib/controller/home/map_page_controller.dart  | 150 +++++++++++-------
 .../payment/payment_controller.dart           |  35 ++--
 lib/main.dart                                 |   2 +-
 lib/views/home/map_page.dart                  |   3 +-
 .../buttom_sheet_map_show.dart                | 105 ++++++------
 .../cash_confirm_bottom_page.dart             |   5 +-
 lib/views/widgets/elevated_btn.dart           |   5 +-
 12 files changed, 341 insertions(+), 205 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e6c4363..4818c37 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
 
-    <application android:label="ride" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
+    <application android:label="SEFER" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index d565daa..91d0781 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
 
-<key>GMSApiKey</key>
-<string>YOUR_API_KEY</string>
-<key>NSLocationWhenInUseUsageDescription</key>
-<string>Your location is required to provide relevant information.</string>
+		<key>GMSApiKey</key>
+		<string>YOUR_API_KEY</string>
+		<key>NSLocationWhenInUseUsageDescription</key>
+		<string>Your location is required to provide relevant information.</string>
 
 
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Ride</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>ride</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Sefer</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>Sefer</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+	</dict>
 </plist>
diff --git a/lib/constant/box_name.dart b/lib/constant/box_name.dart
index ad1c194..a0840d3 100644
--- a/lib/constant/box_name.dart
+++ b/lib/constant/box_name.dart
@@ -16,4 +16,5 @@ class BoxName {
   static const String cvvCode = "cvvCode";
   static const String passengerWalletDetails = "passengerWalletDetails";
   static const String passengerWalletTotal = "passengerWalletTotal";
+  static const String passengerWalletFound = "passengerWalletFound";
 }
diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart
index 2331612..28b7b63 100644
--- a/lib/controller/firebase/firbase_messge.dart
+++ b/lib/controller/firebase/firbase_messge.dart
@@ -5,6 +5,9 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
 import 'package:ride/constant/colors.dart';
+import 'package:ride/constant/style.dart';
+import 'package:ride/controller/functions/launch.dart';
+import 'package:ride/views/widgets/elevated_btn.dart';
 
 import '../../constant/box_name.dart';
 import '../../constant/credential.dart';
@@ -84,31 +87,89 @@ class FirebasMessagesController extends GetxController {
     }
   }
 
-  void getToken() async {
-    await fcmToken.getToken().then((token) {
+  Future getToken() async {
+    fcmToken.getToken().then((token) {
       box.write(BoxName.tokenFCM, token);
       print(token);
     });
 
     FirebaseMessaging.onMessage.listen((RemoteMessage message) {
-      print(
-          'onMessage: ${message.notification!.title} ${message.notification!.body}');
-      if (Get.currentRoute == '/') {
-        // If the app is in the foreground, show a dialog to the user
-        if (message.notification!.title!.contains('ride')) {
-          Get.snackbar('ride', 'message', backgroundColor: AppColor.redColor);
-        }
-      } else {
-        // If the app is in the background or terminated, show a system tray message
-        RemoteNotification? notification = message.notification;
-        AndroidNotification? android = message.notification?.android;
-        if (notification != null && android != null) {
-          print(
-              'onMessageOpenedApp: ${notification.title} ${notification.body}');
-          if (message.notification!.title!.contains('ride')) {
-            Get.snackbar('ride', 'message', backgroundColor: AppColor.redColor);
-            // SendGpsNow().getSiteNotification();
-          }
+      if (message.data.isNotEmpty) {
+        if (message.notification!.title!.contains('Order')) {
+          var myListString = message.data['myList'];
+          var myList = jsonDecode(myListString) as List<dynamic>;
+          Get.defaultDialog(
+              title: message.notification!.title.toString(),
+              content: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Text(message.notification!.body.toString()),
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: TextButton.icon(
+                        onPressed: () {
+                          String mapUrl =
+                              'https://www.google.com/maps/dir/${myList[0]}/${myList[0]}/';
+                          print(mapUrl);
+                          launchUrl1(mapUrl);
+                        },
+                        icon: const Icon(Icons.map),
+                        label: Text('Rouats of Trip'.tr)),
+                  ),
+
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Text(
+                      'Tatal From Passenger is '.tr +
+                          double.parse(myList[2]).toStringAsFixed(2),
+                      style: AppStyle.title,
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Text(
+                      'Tatal For You is '.tr +
+                          double.parse(myList[3]).toStringAsFixed(2),
+                      style: AppStyle.title,
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Text(
+                      'Distance is '.tr + myList[4].toString() + ' Minutes'.tr,
+                      style: AppStyle.title,
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Text(
+                      'Duration of Trip is '.tr + myList[5].toString(),
+                      style: AppStyle.title,
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        MyElevatedButton(
+                          title: 'Apply Order'.tr,
+                          onPressed: () {
+                            //TODO save and request to passenger
+                          },
+                        ),
+                        MyElevatedButton(
+                          title: 'Refuse Order'.tr,
+                          onPressed: () {
+                            //TODO save and request to passenger and driver log upto 3 per 1 day
+                          },
+                          kolor: AppColor.redColor,
+                        ),
+                      ],
+                    ),
+                  )
+                ],
+              ));
         }
       }
     });
@@ -119,8 +180,8 @@ class FirebasMessagesController extends GetxController {
       RemoteNotification? notification = message.notification;
       if (notification != null) {
         print('onMessageOpenedApp: ${notification.title} ${notification.body}');
-        if (message.notification!.title!.contains('ride')) {
-          Get.snackbar('ride', 'message', backgroundColor: AppColor.redColor);
+        if (message.notification!.title!.contains('SEFER')) {
+          Get.snackbar('SEFER', 'message', backgroundColor: AppColor.redColor);
         }
       }
     });
@@ -222,4 +283,31 @@ class FirebasMessagesController extends GetxController {
   //     print('sendNotification() error: $e');
   //   });
   // }
+
+  void sendNotificationDriverId(String title, body, Strin1, Strin2, Strin3,
+      Strin4, Strin5, Strin6, token) async {
+    http
+        .post(Uri.parse('https://fcm.googleapis.com/fcm/send'),
+            headers: <String, String>{
+              'Content-Type': 'application/json',
+              'Authorization': 'key=${AppCredintials.serverAPI}'
+            },
+            body: jsonEncode({
+              'notification': <String, dynamic>{
+                'title': title,
+                'body': body,
+                'sound': 'true'
+              },
+              'data': {
+                'myList': jsonEncode(
+                    [Strin1, Strin2, Strin3, Strin4, Strin5, Strin6]),
+              },
+              'priority': 'high',
+              'to': token,
+            }))
+        .whenComplete(() {})
+        .catchError((e) {
+      print('sendNotification() error: $e');
+    });
+  }
 }
diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart
index a8ee60d..a022b83 100644
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -21,8 +21,8 @@ class CRUD {
             'Basic ${base64Encode(utf8.encode(AppCredintials.basicAuthCredentials))}',
       },
     );
-    // print("--------------" + response.request.toString());
-    // print("--------------" + payload.toString());
+    print("--------------" + response.request.toString());
+    print("--------------" + payload.toString());
     if (response.statusCode == 200) {
       var jsonData = jsonDecode(response.body);
       if (jsonData['status'] == 'success') {
diff --git a/lib/controller/home/map_page_controller.dart b/lib/controller/home/map_page_controller.dart
index 29d5de1..40cee5a 100644
--- a/lib/controller/home/map_page_controller.dart
+++ b/lib/controller/home/map_page_controller.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math' show sqrt, pi, cos, sin;
 import 'package:flutter/material.dart';
-import 'package:geolocator/geolocator.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
@@ -10,6 +9,7 @@ import 'package:location/location.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/constant/credential.dart';
 import 'package:ride/constant/links.dart';
+import 'package:ride/controller/firebase/firbase_messge.dart';
 import 'package:ride/controller/functions/crud.dart';
 import 'package:ride/controller/functions/secure_storage.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';
@@ -115,11 +115,48 @@ class MapController extends GetxController {
     update();
   }
 
-  changeConfirmRide() {
+  changeConfirmRide() async {
     rideConfirm = true;
     print('rideConfirm= $rideConfirm');
 
-    //TODO add ride and get ride id and details
+    await CRUD().post(link: AppLink.addRides, payload: {
+      "start_location":
+          '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
+      "end_location":
+          '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}',
+      "date": DateTime.now().toString(),
+      "time": DateTime.now().toString(),
+      "endtime": durationToAdd.toString(),
+      "price": totalPassenger.toString(),
+      "passenger_id": box.read(BoxName.pasengerID).toString(),
+      "driver_id": dataCarsLocationByPassenger['message'][0]['id'].toString(),
+      "status": "active",
+      "price_for_driver": totalDriver.toString(),
+      "price_for_passenger": totaME.toString(),
+      "distance": distance.toString()
+    }).then((value) {
+      print(value);
+      List<String> body = [
+        '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
+        '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}',
+        totalPassenger.toString(),
+        totalDriver.toString(),
+        duration.toString(),
+        distance.toString(),
+      ];
+      FirebasMessagesController().sendNotificationDriverId(
+        'Order',
+        'body',
+        body[0],
+        body[1],
+        body[2],
+        body[3],
+        body[4],
+        body[5],
+        box.read(BoxName.tokenFCM).toString(), //TODO change to Driver
+      );
+    });
+
     update();
   }
 
@@ -369,7 +406,8 @@ class MapController extends GetxController {
   }
 
   void reloadMarkers() async {
-    await getCarsLocationByPassenger();
+    //TODO await getCarsLocationByPassenger();
+
     // Clear existing markers
     markers.clear();
     getNearestDriverByPassengerLocation();
@@ -392,59 +430,62 @@ class MapController extends GetxController {
 
   String duratioByPassenger = '';
   void getNearestDriverByPassengerLocation() async {
-    double nearestDistance = double.infinity;
-    for (var i = 0; i < dataCarsLocationByPassenger['message'].length; i++) {
-      var carLocation = dataCarsLocationByPassenger['message'][i];
+    if (polylines.isEmpty) {
+      double nearestDistance = double.infinity;
+      for (var i = 0; i < dataCarsLocationByPassenger['message'].length; i++) {
+        var carLocation = dataCarsLocationByPassenger['message'][i];
 
-      // double distance1 = Geolocator.distanceBetween(
-      //   mylocation.latitude,
-      //   mylocation.longitude,
-      //   double.parse(carLocation['latitude']),
-      //   double.parse(carLocation['longitude']),
-      // );
-      // if (distance1 < nearestDistance) {
-      //   nearestDistance = distance1;
-      //   // nearestCarLocation = carLocation;
-      //   nearestCar = CarLocation(
-      //     distance: distance1,
-      //     id: carLocation['driver_id'],
-      //     latitude: double.parse(carLocation['latitude']),
-      //     longitude: double.parse(carLocation['longitude']),
-      //   );
-      // }
-      isloading = true;
-      update();
-      // Make API request to get exact distance and duration
-      String apiUrl =
-          '${AppLink.googleMapsLink}distancematrix/json?destinations=${carLocation['latitude']},${carLocation['longitude']}&origins=${mylocation.latitude},${mylocation.longitude}&units=metric&key=${AppCredintials.mapAPIKEY}';
-      var response = await CRUD().getGoogleApi(link: apiUrl, payload: {});
-      if (response['status'] == "OK") {
-        var data = response;
-        // Extract distance and duration from the response and handle accordingly
-        int distance1 = data['rows'][0]['elements'][0]['distance']['value'];
-        duration1 = data['rows'][0]['elements'][0]['duration']['value'];
-        duratioByPassenger = data['rows'][0]['elements'][0]['duration']['text'];
+        // double distance1 = Geolocator.distanceBetween(
+        //   mylocation.latitude,
+        //   mylocation.longitude,
+        //   double.parse(carLocation['latitude']),
+        //   double.parse(carLocation['longitude']),
+        // );
+        // if (distance1 < nearestDistance) {
+        //   nearestDistance = distance1;
+        //   // nearestCarLocation = carLocation;
+        //   nearestCar = CarLocation(
+        //     distance: distance1,
+        //     id: carLocation['driver_id'],
+        //     latitude: double.parse(carLocation['latitude']),
+        //     longitude: double.parse(carLocation['longitude']),
+        //   );
+        // }
+        isloading = true;
+        update();
+        // Make API request to get exact distance and duration
+        String apiUrl =
+            '${AppLink.googleMapsLink}distancematrix/json?destinations=${carLocation['latitude']},${carLocation['longitude']}&origins=${mylocation.latitude},${mylocation.longitude}&units=metric&key=${AppCredintials.mapAPIKEY}';
+        var response = await CRUD().getGoogleApi(link: apiUrl, payload: {});
+        if (response['status'] == "OK") {
+          var data = response;
+          // Extract distance and duration from the response and handle accordingly
+          int distance1 = data['rows'][0]['elements'][0]['distance']['value'];
+          duration1 = data['rows'][0]['elements'][0]['duration']['value'];
+          duratioByPassenger =
+              data['rows'][0]['elements'][0]['duration']['text'];
 
-        if (distance1 < nearestDistance) {
-          nearestDistance = distance1.toDouble();
+          if (distance1 < nearestDistance) {
+            nearestDistance = distance1.toDouble();
 
-          nearestCar = CarLocation(
-            distance: distance1.toDouble(),
-            duration: duration1.toDouble(),
-            id: carLocation['driver_id'],
-            latitude: double.parse(carLocation['latitude']),
-            longitude: double.parse(carLocation['longitude']),
-          );
-          isloading = false;
-          update();
+            nearestCar = CarLocation(
+              distance: distance1.toDouble(),
+              duration: duration1.toDouble(),
+              id: carLocation['driver_id'],
+              latitude: double.parse(carLocation['latitude']),
+              longitude: double.parse(carLocation['longitude']),
+            );
+            isloading = false;
+            update();
+          }
         }
-      }
 
-      // Handle the distance and duration as needed
-      else {
-        print(
-            'Failed to retrieve distance and duration: ${response['status']}');
-        // Handle the failure case
+        // Handle the distance and duration as needed
+        else {
+          print(
+              'Failed to retrieve distance and duration: ${response['status']}');
+          // Handle the failure case
+        }
       }
     }
     print(nearestCar!.distance);
@@ -534,6 +575,7 @@ class MapController extends GetxController {
   bool promoTaken = false;
   void applyPromoCodetoPassenger() async {
     //TAWJIHI
+
     CRUD().get(link: AppLink.getPassengersPromo, payload: {
       'promo_code': promo.text,
     }).then((value) {
@@ -736,8 +778,8 @@ class MapController extends GetxController {
   @override
   void onInit() async {
     await getLocation();
-    await getCarsLocationByPassenger();
-    getNearestDriverByPassengerLocation();
+    // await getCarsLocationByPassenger();
+    // getNearestDriverByPassengerLocation();
     addCustomPicker();
     addCustomCarIcon();
     startMarkerReloading();
diff --git a/lib/controller/payment/payment_controller.dart b/lib/controller/payment/payment_controller.dart
index 5f7fc43..08ed29d 100644
--- a/lib/controller/payment/payment_controller.dart
+++ b/lib/controller/payment/payment_controller.dart
@@ -13,30 +13,34 @@ class PaymentController extends GetxController {
   bool isloading = false;
   bool isWalletCheced = false;
   bool isCashCheced = false;
+  bool isWalletFound = false;
   final formKey = GlobalKey<FormState>();
   final promo = TextEditingController();
   double totalPassenger = MapController().totalPassenger;
+  List<dynamic> totalPassengerWalletDetails = [];
+  String passengerTotalWalletAmount = '';
+
   getPassengerWallet() async {
     isloading = true;
     update();
-    if (box.read(BoxName.passengerWalletDetails) == null) {
+    box.write(BoxName.passengerWalletFound, isWalletFound);
+    // totalPassengerWalletDetails = box.read(BoxName.passengerWalletDetails);
+
+    if (totalPassengerWalletDetails == null ||
+        totalPassengerWalletDetails.isEmpty) {
       await CRUD().get(link: AppLink.getWalletByPassenger, payload: {
         'passenger_id': box.read(BoxName.pasengerID)
       }).then((value) {
-        final total = jsonDecode(value)['message'];
-
-        box.write(BoxName.passengerWalletDetails, total);
+        print(value);
+        totalPassengerWalletDetails = jsonDecode(value)['message'];
+        passengerTotalWalletAmount = totalPassengerWalletDetails[0]['total'];
+        box.write(BoxName.passengerWalletDetails, totalPassengerWalletDetails);
       });
-      isloading = false;
-      update();
-      print('from empty');
-      print(box.read(BoxName.passengerWalletDetails));
-    } else {
-      box.read(BoxName.passengerWalletDetails);
-      update();
-      print('from full');
-      print(box.read(BoxName.passengerWalletDetails));
     }
+
+    isloading = false;
+    update();
+    print(totalPassengerWalletDetails);
   }
 
   void onChangedPymentethodWallet(bool? value) {
@@ -63,6 +67,7 @@ class PaymentController extends GetxController {
         var firstElement = decod["message"][0];
         totalPassenger = totalPassenger -
             (totalPassenger * int.parse(firstElement['amount']));
+        MapController().promoTaken = true;
         update();
         print(totalPassenger);
       }
@@ -70,8 +75,8 @@ class PaymentController extends GetxController {
   }
 
   @override
-  void onInit() {
-    getPassengerWallet();
+  void onInit() async {
+    await getPassengerWallet();
 
     super.onInit();
   }
diff --git a/lib/main.dart b/lib/main.dart
index 15e6d72..bb5a106 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -40,7 +40,7 @@ void main() async {
 
   await FirebasMessagesController().requestFirebaseMessagingPermission();
   // await FirebasMessagesController().getNotificationSettings();
-  FirebasMessagesController().getToken();
+  await FirebasMessagesController().getToken();
   await FirebasMessagesController().getTokens();
   LocationPermissions().locationPermissions();
   FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
diff --git a/lib/views/home/map_page.dart b/lib/views/home/map_page.dart
index b5a8f92..9bb190b 100644
--- a/lib/views/home/map_page.dart
+++ b/lib/views/home/map_page.dart
@@ -129,7 +129,8 @@ class MapPage extends StatelessWidget {
                     //   Circle(
                     //       circleId: const CircleId('kk'),
                     //       center: controller.mylocation,
-                    //       radius: 2000)
+                    //       radius: 60,
+                    //       fillColor: AppColor.primaryColor,)
                     // },
                     mapType:
                         controller.mapType ? MapType.satellite : MapType.normal,
diff --git a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart
index 1d7d4fe..61c6929 100644
--- a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart
+++ b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart
@@ -233,61 +233,62 @@ GetBuilder<MapController> buttomSheetMapPage() {
                                                             ),
                                                             InkWell(
                                                               onTap: () {
-                                                                Get.defaultDialog(
-                                                                    title: 'Add Promo'.tr,
-                                                                    content: Column(
-                                                                      children: [
-                                                                        SizedBox(
-                                                                          width:
-                                                                              Get.width * .7,
-                                                                          child:
-                                                                              TextFormField(
-                                                                            controller:
-                                                                                controller.promo,
-                                                                            decoration:
-                                                                                InputDecoration(
-                                                                              labelText: 'Promo Code'.tr,
-                                                                              hintText: 'Enter promo code'.tr,
-                                                                              border: OutlineInputBorder(
-                                                                                borderRadius: BorderRadius.circular(10),
-                                                                              ),
-                                                                              filled: true,
-                                                                              fillColor: Colors.grey[200],
-                                                                              focusedBorder: OutlineInputBorder(
-                                                                                borderSide: const BorderSide(
-                                                                                  color: AppColor.primaryColor,
-                                                                                  width: 2.0,
+                                                                Get
+                                                                    .defaultDialog(
+                                                                        title: 'Add Promo'
+                                                                            .tr,
+                                                                        content:
+                                                                            Column(
+                                                                          children: [
+                                                                            SizedBox(
+                                                                              width: Get.width * .7,
+                                                                              child: TextFormField(
+                                                                                controller: controller.promo,
+                                                                                decoration: InputDecoration(
+                                                                                  labelText: 'Promo Code'.tr,
+                                                                                  hintText: 'Enter promo code'.tr,
+                                                                                  border: OutlineInputBorder(
+                                                                                    borderRadius: BorderRadius.circular(10),
+                                                                                  ),
+                                                                                  filled: true,
+                                                                                  fillColor: Colors.grey[200],
+                                                                                  focusedBorder: OutlineInputBorder(
+                                                                                    borderSide: const BorderSide(
+                                                                                      color: AppColor.primaryColor,
+                                                                                      width: 2.0,
+                                                                                    ),
+                                                                                    borderRadius: BorderRadius.circular(10),
+                                                                                  ),
+                                                                                  errorBorder: OutlineInputBorder(
+                                                                                    borderSide: const BorderSide(
+                                                                                      color: Colors.red,
+                                                                                      width: 2.0,
+                                                                                    ),
+                                                                                    borderRadius: BorderRadius.circular(10),
+                                                                                  ),
+                                                                                  enabledBorder: OutlineInputBorder(
+                                                                                    borderSide: const BorderSide(
+                                                                                      color: Colors.grey,
+                                                                                      width: 1.0,
+                                                                                    ),
+                                                                                    borderRadius: BorderRadius.circular(10),
+                                                                                  ),
                                                                                 ),
-                                                                                borderRadius: BorderRadius.circular(10),
-                                                                              ),
-                                                                              errorBorder: OutlineInputBorder(
-                                                                                borderSide: const BorderSide(
-                                                                                  color: Colors.red,
-                                                                                  width: 2.0,
-                                                                                ),
-                                                                                borderRadius: BorderRadius.circular(10),
-                                                                              ),
-                                                                              enabledBorder: OutlineInputBorder(
-                                                                                borderSide: const BorderSide(
-                                                                                  color: Colors.grey,
-                                                                                  width: 1.0,
-                                                                                ),
-                                                                                borderRadius: BorderRadius.circular(10),
                                                                               ),
                                                                             ),
-                                                                          ),
-                                                                        ),
-                                                                        MyElevatedButton(
-                                                                          title:
-                                                                              'Add Promo'.tr,
-                                                                          onPressed:
-                                                                              () async {
-                                                                            controller.applyPromoCodetoPassenger();
-                                                                            Get.back();
-                                                                          },
-                                                                        )
-                                                                      ],
-                                                                    ));
+                                                                            MyElevatedButton(
+                                                                              title: 'Add Promo'.tr,
+                                                                              onPressed: () async {
+                                                                                if (controller.promoTaken == false) {
+                                                                                  controller.applyPromoCodetoPassenger();
+                                                                                  Get.back();
+                                                                                } else {
+                                                                                  Get.defaultDialog(title: 'You have Promo ?.'.tr);
+                                                                                }
+                                                                              },
+                                                                            )
+                                                                          ],
+                                                                        ));
                                                               },
                                                               child: Text(
                                                                 'Add Promo'.tr,
diff --git a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
index 57b2ff9..65f9a80 100644
--- a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
+++ b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
@@ -2,11 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/constant/style.dart';
-import 'package:ride/controller/functions/secure_storage.dart';
 import 'package:ride/controller/home/payment/payment_controller.dart';
-import 'package:ride/views/widgets/circle_container.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';
-import 'package:ride/views/widgets/mycircular.dart';
 
 import '../../../constant/colors.dart';
 import '../../../controller/home/map_page_controller.dart';
@@ -72,7 +69,7 @@ class CashConfirmPageShown extends StatelessWidget {
                                 ),
                                 Text(
                                   // '${'Your Wallet balance is '.tr}JD ',
-                                  '${'Your Wallet balance is '.tr}JD ${box.read(BoxName.passengerWalletDetails)[0]['total'].toString()}',
+                                  '${'Your Wallet balance is '.tr}JD ${controller.passengerTotalWalletAmount.toString()}',
                                   style: AppStyle.subtitle,
                                 ),
                               ],
diff --git a/lib/views/widgets/elevated_btn.dart b/lib/views/widgets/elevated_btn.dart
index db14ef3..ecbd7dc 100644
--- a/lib/views/widgets/elevated_btn.dart
+++ b/lib/views/widgets/elevated_btn.dart
@@ -6,18 +6,19 @@ import '../../constant/colors.dart';
 class MyElevatedButton extends StatelessWidget {
   final String title;
   final VoidCallback onPressed;
-
+  final Color kolor;
   const MyElevatedButton({
     Key? key,
     required this.title,
     required this.onPressed,
+    this.kolor = AppColor.primaryColor,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return ElevatedButton(
       style: ButtonStyle(
-        backgroundColor: MaterialStateProperty.all(AppColor.primaryColor),
+        backgroundColor: MaterialStateProperty.all(kolor),
       ),
       onPressed: onPressed,
       child: Text(