25-6-23/1

2025-06-23 02:24:42 +03:00
parent 5eba032887
commit 5050aab9b7
42 changed files with 2387 additions and 1783 deletions
--- a/lib/controller/home/captin/home_captain_controller.dart
+++ b/lib/controller/home/captin/home_captain_controller.dart
@@ -12,8 +12,10 @@ import '../../../constant/links.dart';
 import '../../../constant/style.dart';
 import '../../../constant/table_names.dart';
 import '../../../main.dart';
+import '../../../print.dart';
 import '../../../views/home/my_wallet/walet_captain.dart';
 import '../../../views/widgets/elevated_btn.dart';
+import '../../firebase/firbase_messge.dart';
 import '../../functions/crud.dart';
 import '../../functions/location_background_controller.dart';
 import '../../functions/location_controller.dart';
@@ -264,7 +266,7 @@ class HomeCaptainController extends GetxController {
  @override
  void onInit() async {
    // await locationBackController.requestLocationPermission();
-
+    Get.put(FirebaseMessagesController());
    addToken();
    await getlocation();
    onButtonSelected();
@@ -429,6 +431,7 @@ class HomeCaptainController extends GetxController {

  void changeToAppliedRide(String status) {
    box.write(BoxName.rideStatus, status);
+    Log.print('rideStatus from homcaptain : ${box.read(BoxName.rideStatus)}');
    update();
  }

--- a/lib/controller/home/captin/map_driver_controller.dart
+++ b/lib/controller/home/captin/map_driver_controller.dart
@@ -25,6 +25,7 @@ import '../../firebase/firbase_messge.dart';
 import '../../functions/crud.dart';
 import '../../functions/encrypt_decrypt.dart';
 import '../../functions/location_controller.dart';
+import '../../functions/tts.dart';

 class MapDriverController extends GetxController {
  bool isLoading = true;
@@ -174,7 +175,7 @@ class MapDriverController extends GetxController {
  cancelTripFromDriverAfterApplied() async {
    if (formKeyCancel.currentState!.validate()) {
      box.write(BoxName.statusDriverLocation, 'off');
-      FirebaseMessagesController().sendNotificationToDriverMAP(
+      Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
        "Cancel Trip from driver",
        "Trip Cancelled from driver. We are looking for a new driver. Please wait."
            .tr,
@@ -235,6 +236,8 @@ class MapDriverController extends GetxController {
        'created_at': DateTime.now().toString(),
        'driver_id': box.read(BoxName.driverID).toString(),
      }, TableName.driverOrdersRefuse);
+      box.write(BoxName.rideStatus, 'Cancel');
+      Log.print('rideStatus from map 240 : ${box.read(BoxName.rideStatus)}');
      Get.find<HomeCaptainController>().getRefusedOrderByCaptain();
      Get.offAll(() => HomeCaptain());
    }
@@ -242,6 +245,7 @@ class MapDriverController extends GetxController {

  void startTimerToShowPassengerInfoWindowFromDriver() async {
    if (box.read(BoxName.rideStatus) == 'Begin') {
+      Log.print('rideStatus from map 248 : ${box.read(BoxName.rideStatus)}');
      isPassengerInfoWindow = false;
    } else {
      isPassengerInfoWindow = true;
@@ -298,6 +302,7 @@ class MapDriverController extends GetxController {
  void driverGoToPassenger() async {
    changeRideToBeginToPassenger();
    box.write(BoxName.rideStatus, 'Applied');
+    Log.print('rideStatus from map 304 : ${box.read(BoxName.rideStatus)}');
    update();
    await CRUD().post(
        link: "${AppLink.seferCairoServer}/ride/rides/update.php",
@@ -315,7 +320,7 @@ class MapDriverController extends GetxController {
    }
    // Get.find<HomeCaptainController>().changeToAppliedRide('Applied');

-    FirebaseMessagesController().sendNotificationToDriverMAP(
+    Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
        'Driver Is Going To Passenger'.tr,
        box.read(BoxName.nameDriver).toString(), //todo name driver
        tokenPassenger,
@@ -392,6 +397,7 @@ class MapDriverController extends GetxController {
      // todo ride details
      // Get.find<HomeCaptainController>().changeToAppliedRide('Begin');
      box.write(BoxName.rideStatus, 'Begin');
+      Log.print('rideStatus from map 399  : ${box.read(BoxName.rideStatus)}');
      // Get.find<HomeCaptainController>().update();
      update();
      await CRUD().post(link: AppLink.updateRides, payload: {
@@ -418,7 +424,7 @@ class MapDriverController extends GetxController {
              'status': 'Begin'
            });
      }
-      FirebaseMessagesController().sendNotificationToDriverMAP(
+      Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
          'Trip is Begin'.tr,
          box.read(BoxName.nameDriver).toString(),
          tokenPassenger,
@@ -584,17 +590,29 @@ class MapDriverController extends GetxController {
    }
  }

-  void finishRideFromDriver() {
+  Future<void> finishRideFromDriver() async {
    double distanceToDestination = Geolocator.distanceBetween(
-      latLngPassengerLocation.latitude,
-      latLngPassengerLocation.longitude,
+      latLngPassengerDestination.latitude,
+      latLngPassengerDestination.longitude,
      Get.find<LocationController>().myLocation.latitude,
      Get.find<LocationController>().myLocation.longitude,
    );
+    final originalDistanceM = double.parse(distance.toString()) * 1000;

-    if (distanceToDestination > (double.parse(distance.toString()) / 3)) {
-      Log.print('distanceToDestination: ${distanceToDestination}');
+    // 2. احسب المسافة التي قطعها السائق حتى الآن
+    final movedDistanceM = originalDistanceM - distanceToDestination;

+    // 3. عتبة ثلث المسافة
+    final oneThirdDistanceM = originalDistanceM / 3;
+
+    // Logging للتتبع
+    Log.print('originalDistanceM: $originalDistanceM');
+    Log.print('distanceToDestinationM: $distanceToDestination');
+    Log.print('movedDistanceM: $movedDistanceM');
+    Log.print('oneThirdDistanceM: $oneThirdDistanceM');
+
+    // 4. إذا لم يقطع السائق ثلث المسافة، نعرض التأكيد
+    if (movedDistanceM < oneThirdDistanceM) {
      MyDialog().getDialog(
        'Are you sure to exit ride?'.tr,
        '',
@@ -603,33 +621,39 @@ class MapDriverController extends GetxController {
          finishRideFromDriver1();
        },
      );
-    } else {
+    } /////
+
+    else {
+      final textToSpeechController = Get.put(TextToSpeechController());
      MyDialog().getDialog(
        "You haven't moved sufficiently!".tr,
        '',
        () => Get.back(),
      );
+      await textToSpeechController
+          .speakText("You haven't moved sufficiently!".tr);
    }
  }

  String paymentToken = '';
  Future<String> generateTokenDriver(String amount) async {
-    var res = await CRUD().post(link: AppLink.addPaymentTokenDriver, payload: {
+    var res =
+        await CRUD().postWallet(link: AppLink.addPaymentTokenDriver, payload: {
      'driverID': box.read(BoxName.driverID).toString(),
      'amount': amount.toString(),
    });
-    var d = jsonDecode(res);
+    var d = (res);
    return d['message'];
  }

  String paymentTokenPassenger = '';
  Future<String> generateTokenPassenger(String amount) async {
-    var res =
-        await CRUD().post(link: AppLink.addPaymentTokenPassenger, payload: {
+    var res = await CRUD()
+        .postWallet(link: AppLink.addPaymentTokenPassenger, payload: {
      'passengerId': passengerId,
      'amount': amount.toString(),
    });
-    var d = jsonDecode(res);
+    var d = (res);
    return d['message'];
  }

@@ -638,6 +662,7 @@ class MapDriverController extends GetxController {
    isRideStarted = false;
    isPriceWindow = false;
    box.write(BoxName.rideStatus, 'Finished');
+    Log.print('rideStatus from map 664 : ${box.read(BoxName.rideStatus)}');

    // Calculate totalCost more concisely
    if (price < 20) {
@@ -699,7 +724,8 @@ class MapDriverController extends GetxController {
    if (walletChecked == 'true') {
      paymentToken = await generateTokenPassenger(
          ((-1) * double.parse(paymentAmount)).toString());
-      futures.add(CRUD().post(link: AppLink.addPassengersWallet, payload: {
+      futures
+          .add(CRUD().postWallet(link: AppLink.addPassengersWallet, payload: {
        'passenger_id': (passengerId),
        'balance': ((-1) * double.parse(paymentAmount)).toString(),
        'token': paymentToken,
@@ -707,7 +733,7 @@ class MapDriverController extends GetxController {
    }

    paymentToken = await generateTokenDriver(paymentAmount.toString());
-    futures.add(CRUD().post(link: AppLink.addDrivePayment, payload: {
+    futures.add(CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
      'rideId': (rideId),
      'amount': paymentAmount,
      'payment_method':
@@ -720,7 +746,8 @@ class MapDriverController extends GetxController {
    if (double.parse(passengerWalletBurc) < 0) {
      final paymentToken1 = await generateTokenPassenger(
          ((-1) * double.parse(passengerWalletBurc)).toString());
-      futures.add(CRUD().post(link: AppLink.addPassengersWallet, payload: {
+      futures
+          .add(CRUD().postWallet(link: AppLink.addPassengersWallet, payload: {
        'passenger_id': (passengerId),
        'token': paymentToken1,
        'balance': ((-1) * double.parse(passengerWalletBurc)).toString()
@@ -730,7 +757,8 @@ class MapDriverController extends GetxController {
    double pointsSubtraction = double.parse(paymentAmount) * (-1) * 0.08;
    final paymentToken2 =
        await generateTokenDriver((pointsSubtraction).toStringAsFixed(0));
-    futures.add(CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
+    futures
+        .add(CRUD().postWallet(link: AppLink.addDriversWalletPoints, payload: {
      'paymentID': 'rideId${(rideId)}',
      'amount': (pointsSubtraction).toStringAsFixed(0),
      'paymentMethod': paymentMethod,
@@ -743,7 +771,7 @@ class MapDriverController extends GetxController {
    Get.put(DriverBehaviorController()).sendSummaryToServer(driverId, rideId);

    // Send notification (this likely depends on previous steps)
-    FirebaseMessagesController().sendNotificationToDriverMAP(
+    Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
        "Driver Finish Trip".tr,
        '${'you will pay to Driver'.tr} $paymentAmount \$',
        tokenPassenger,
@@ -862,7 +890,7 @@ class MapDriverController extends GetxController {
  //     'driverID': box.read(BoxName.driverID).toString(),
  //   });
  //   Future.delayed(const Duration(milliseconds: 300));
-  //   FirebaseMessagesController().sendNotificationToDriverMAP(
+  //    Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
  //       "Driver Finish Trip".tr,
  //       '${'you will pay to Driver'.tr} $paymentAmount \$',
  //       tokenPassenger,
@@ -1362,7 +1390,8 @@ class MapDriverController extends GetxController {
  void onInit() async {
    mapAPIKEY = await storage.read(key: BoxName.mapAPIKEY);
    // Get the passenger location from the arguments.
-    // await argumentLoading();
+    await argumentLoading();
+    Get.put(FirebaseMessagesController());
    runGoogleMapDirectly();
    addCustomCarIcon();
    addCustomPassengerIcon();
--- a/lib/controller/home/payment/captain_wallet_controller.dart
+++ b/lib/controller/home/payment/captain_wallet_controller.dart
@@ -82,7 +82,7 @@ class CaptainWalletController extends GetxController {
        //get new driver details
        isNewTransfer = true;
        update();
-        var res = await CRUD().getWallet(
+        var res = await CRUD().get(
            link: AppLink.getDriverDetails,
            payload: {'driver_phone': '+2${newDriverPhoneController.text}'});
        isNewTransfer = false;
@@ -155,7 +155,7 @@ class CaptainWalletController extends GetxController {
      'driverID': box.read(BoxName.driverID).toString(),
      'amount': amount.toString(),
    });
-    var d = jsonDecode(res);
+    var d = (res);
    return d['message'];
  }

@@ -168,14 +168,14 @@ class CaptainWalletController extends GetxController {
      'amount': amount.toString(),
      'payment_method': paymentMethod.toString(),
    });
-    var d = jsonDecode(res);
+    var d = (res);
    // paymentID = d['message'].toString();
    return d['message'];
  }

  Future addDriverWallet(String paymentMethod, point, count) async {
    paymentToken = await generateToken(count);
-    var paymentID = await getPaymentId(paymentMethod, point);
+    var paymentID = await getPaymentId(paymentMethod, point.toString());
    await CRUD().postWallet(link: AppLink.addDriversWalletPoints, payload: {
      'driverID': box.read(BoxName.driverID).toString(),
      'paymentID': paymentID.toString(),
@@ -245,7 +245,8 @@ class CaptainWalletController extends GetxController {
      'payment_method': paymentMethod.toString(),
      'passengerID': paymentMethod,
    });
-    await addSeferWallet(paymentMethod, (double.parse(point) * -1).toString());
+    await addSeferWallet(paymentMethod,
+        (double.parse(point) * -2).toString()); // deduct 2 from sefer wallet
  }

  Future addSeferWallet(String paymentMethod, String point) async {
@@ -290,7 +291,7 @@ class CaptainWalletController extends GetxController {
      'paymentMethod': paymentMethod2.toString(),
    });
    if (res1 != 'failure') {
-      FirebaseMessagesController().sendNotificationToDriverMAP(
+      Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
          'Transfer',
          '${'You have transfer to your wallet from'.tr}'
              '${box.read(BoxName.nameDriver)}',
--- a/lib/controller/home/payment/paymob_payout.dart
+++ b/lib/controller/home/payment/paymob_payout.dart
@@ -1,15 +1,12 @@
 import 'dart:convert';

 import 'package:local_auth/local_auth.dart';
-import 'package:sefer_driver/constant/api_key.dart';
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
-import 'package:secure_string_operations/secure_string_operations.dart';

-import '../../../constant/char_map.dart';
 import '../../../constant/links.dart';
 import '../../../views/widgets/mydialoug.dart';
 import '../../functions/crud.dart';
@@ -19,39 +16,8 @@ class PaymobPayout extends GetxController {
  bool isLoading = false;
  String dropdownValue = 'etisalat';

-  Future<String> getToken() async {
-    var headers = {
-      'Content-Type': 'application/x-www-form-urlencoded',
-      // 'Cookie':
-      //     'csrftoken=74iZJ8XYyuTm5WRq2W4tpWX5eqoJLZVK5QhuDrChWpDtzpgGA269bbCWuEcW85t4'
-    };
-    var payMobOutClientSecrret =
-        X.r(X.r(X.r(await getAIKey(KN.pmobsec), cn), cC), cs);
-    var payMobOutClientId =
-        X.r(X.r(X.r(await getAIKey(KN.pmobid), cn), cC), cs);
-    var body = {
-      'grant_type': 'password',
-      'username': AK.payMobOutUserName,
-      'password': AK.payMobOutPassword,
-      'client_id': payMobOutClientId,
-      'client_secret': payMobOutClientSecrret
-    };
-    var res = await http.post(
-      Uri.parse('https://payouts.paymobsolutions.com/api/secure/o/token/'),
-      headers: headers,
-      body: body,
-    );
-    String token = '';
-    if (res.statusCode == 200) {
-      var decode = jsonDecode(res.body);
-      token = decode['access_token'];
-    }
-    return token;
-  }
-
  int payOutFee = 5;
-  payToDriverWallet(
-      String token, String amount, String issuer, String msisdn) async {
+  payToDriverWallet(String amount, String issuer, String msisdn) async {
    bool isAvailable = await LocalAuthentication().isDeviceSupported();
    if (isAvailable) {
      // Authenticate the user
@@ -62,21 +28,18 @@ class PaymobPayout extends GetxController {
            sensitiveTransaction: true,
          ));
      if (didAuthenticate) {
-        var headers = {
-          'Authorization': 'Bearer $token',
-          'Content-Type': 'application/json',
-        };
-        var body = json.encode({
-          "amount": amount, //"10.00",
-          "issuer": issuer, //"vodafone",
-          "msisdn": msisdn, // "01023456789"
-        });
-        var res = await http.post(
-          Uri.parse('https://payouts.paymobsolutions.com/api/secure/disburse/'),
-          headers: headers,
-          body: body,
-        );
-        var dec = jsonDecode(res.body);
+        var dec = await CRUD().postWallet(
+            link:
+                'wl.tripz-egypt.com/v1/main/ride/payMob/paymob_driver/paymob_payout.php',
+            payload: {
+              "issuer": issuer,
+              "method": "wallet",
+              "amount": amount, //9.0,
+              "full_name":
+                  '${box.read(BoxName.nameDriver)} ${box.read(BoxName.lastNameDriver)}',
+              "msisdn": msisdn, //"01010101010",
+              "bank_transaction_type": "cash_transfer"
+            });
        if (dec['disbursement_status'] == 'successful') {
          var paymentToken = await Get.find<CaptainWalletController>()
              .generateToken(
@@ -149,8 +112,8 @@ class PaymobPayout extends GetxController {
    } else {}
  }

-  payToDriverBankAccount(String token, String amount, String bankCardNumber,
-      String bankCode) async {
+  payToDriverBankAccount(
+      String amount, String bankCardNumber, String bankCode) async {
    bool isAvailable = await LocalAuthentication().isDeviceSupported();
    if (isAvailable) {
      // Authenticate the user
@@ -161,12 +124,9 @@ class PaymobPayout extends GetxController {
            sensitiveTransaction: true,
          ));
      if (didAuthenticate) {
-        var headers = {
-          'Authorization': 'Bearer $token',
-          'Content-Type': 'application/json',
-        };
        var body = {
          "issuer": "bank_card",
+          "method": "bank_card",
          "amount": amount, //9.0,
          "full_name":
              '${box.read(BoxName.nameDriver)} ${box.read(BoxName.lastNameDriver)}',
@@ -174,12 +134,11 @@ class PaymobPayout extends GetxController {
          "bank_code": bankCode, //"CIB",
          "bank_transaction_type": "cash_transfer"
        };
-        var res = await http.post(
-          Uri.parse('https://payouts.paymobsolutions.com/api/secure/disburse/'),
-          headers: headers,
-          body: body,
+        var dec = await CRUD().postWallet(
+          link:
+              'wl.tripz-egypt.com/v1/main/ride/payMob/paymob_driver/paymob_payout.php',
+          payload: body,
        );
-        var dec = jsonDecode(res.body);
        if (dec['disbursement_status'] == 'successful') {
          var paymentToken = await Get.find<CaptainWalletController>()
              .generateToken(
@@ -236,8 +195,7 @@ class PaymobPayout extends GetxController {
            sensitiveTransaction: true,
          ));
      if (didAuthenticate) {
-        String token = await getToken();
-        await payToDriverWallet(token, amount, issuer, msisdn);
+        await payToDriverWallet(amount, issuer, msisdn);
      } else {
        MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
          Get.back();
@@ -263,8 +221,7 @@ class PaymobPayout extends GetxController {
            sensitiveTransaction: true,
          ));
      if (didAuthenticate) {
-        String token = await getToken();
-        await payToDriverBankAccount(token, amount, bankCardNumber, bankCode);
+        await payToDriverBankAccount(amount, bankCardNumber, bankCode);
      } else {
        MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
          Get.back();