25-3/18/1

lib/controller/home/captin/home_captain_controller.dart

@@ -323,21 +323,33 @@ class HomeCaptainController extends GetxController {
   // }
 
   addToken() async {
+    String? fingerPrint = await storage.read(key: BoxName.fingerPrint);
     await CRUD().post(link: AppLink.addTokensDriver, payload: {
-      'token': box.read(BoxName.tokenDriver),
-      'captain_id': box.read(BoxName.driverID).toString()
+      'token': (box.read(BoxName.tokenDriver)),
+      'captain_id': (box.read(BoxName.driverID)).toString(),
+      'fingerPrint': (fingerPrint).toString()
     });
+
     await CRUD().post(
         link: "${AppLink.seferAlexandriaServer}/ride/firebase/addDriver.php",
         payload: {
           'token': box.read(BoxName.tokenDriver),
-          'captain_id': box.read(BoxName.driverID).toString()
+          'captain_id': box.read(BoxName.driverID).toString(),
+          'fingerPrint': (fingerPrint).toString()
         });
     await CRUD().post(
         link: "${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
         payload: {
           'token': box.read(BoxName.tokenDriver),
-          'captain_id': box.read(BoxName.driverID).toString()
+          'captain_id': box.read(BoxName.driverID).toString(),
+          'fingerPrint': (fingerPrint).toString()
+        });
+    await CRUD().post(
+        link: "${AppLink.seferPaymentServer}/ride/firebase/addDriver.php",
+        payload: {
+          'token': box.read(BoxName.tokenDriver),
+          'captain_id': box.read(BoxName.driverID).toString(),
+          'fingerPrint': (fingerPrint).toString()
         });
     MapDriverController().driverCallPassenger();
     // box.write(BoxName.statusDriverLocation, 'off');

lib/controller/home/payment/captain_wallet_controller.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:local_auth/local_auth.dart';
 import 'package:sefer_driver/constant/style.dart';
 import 'package:sefer_driver/controller/firebase/firbase_messge.dart';
 import 'package:sefer_driver/controller/firebase/local_notification.dart';
@@ -12,6 +13,8 @@ import 'package:sefer_driver/constant/links.dart';
 import 'package:sefer_driver/controller/functions/crud.dart';
 import 'package:sefer_driver/main.dart';
 
+import '../../../views/widgets/mydialoug.dart';
+
 class CaptainWalletController extends GetxController {
   bool isLoading = false;
   final formKeyTransfer = GlobalKey<FormState>();
@@ -40,7 +43,7 @@ class CaptainWalletController extends GetxController {
           await generateToken((pointFromBudget * -1).toString());
       var paymentID = await getPaymentId(
           'fromBudgetToPoints', (pointFromBudget * -1).toString());
-      await CRUD().post(link: AppLink.addDrivePayment, payload: {
+      await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
         'amount': (pointFromBudget * -1).toString(),
         'rideId': paymentID.toString(),
         'payment_method': 'myBudget',
@@ -79,7 +82,7 @@ class CaptainWalletController extends GetxController {
         //get new driver details
         isNewTransfer = true;
         update();
-        var res = await CRUD().get(
+        var res = await CRUD().getWallet(
             link: AppLink.getDriverDetails,
             payload: {'driver_phone': '+2${newDriverPhoneController.text}'});
         isNewTransfer = false;
@@ -100,7 +103,7 @@ class CaptainWalletController extends GetxController {
   Future getCaptainWalletFromRide() async {
     isLoading = true;
     update();
-    var res = await CRUD().get(
+    var res = await CRUD().getWallet(
       link: AppLink.getAllPaymentFromRide,
       payload: {'driverID': box.read(BoxName.driverID).toString()},
     );
@@ -109,7 +112,7 @@ class CaptainWalletController extends GetxController {
       walletDate = jsonDecode(res);
       totalAmount = walletDate['message'][0]['total_amount'] ?? '0';
       update();
-      var res1 = await CRUD().get(
+      var res1 = await CRUD().getWallet(
           link: AppLink.getAllPaymentVisa,
           payload: {'driverID': box.read(BoxName.driverID).toString()});
       walletDateVisa = jsonDecode(res1);
@@ -126,7 +129,7 @@ class CaptainWalletController extends GetxController {
     // isLoading = true;
     update();
 
-    var res = await CRUD().get(
+    var res = await CRUD().getWallet(
       link: AppLink.getDriverPaymentPoints,
       payload: {'driverID': box.read(BoxName.driverID).toString()},
     );
@@ -147,7 +150,8 @@ class CaptainWalletController extends GetxController {
 
   String paymentToken = '';
   Future<String> generateToken(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(),
     });
@@ -158,7 +162,8 @@ class CaptainWalletController extends GetxController {
   // late String paymentID;
   Future<String> getPaymentId(String paymentMethod, amount) async {
     // paymentToken = await generateToken(amount);
-    var res = await CRUD().post(link: AppLink.addDriverPaymentPoints, payload: {
+    var res =
+        await CRUD().postWallet(link: AppLink.addDriverPaymentPoints, payload: {
       'driverID': box.read(BoxName.driverID).toString(),
       'amount': amount.toString(),
       'payment_method': paymentMethod.toString(),
@@ -171,7 +176,7 @@ class CaptainWalletController extends GetxController {
   Future addDriverWallet(String paymentMethod, point, count) async {
     paymentToken = await generateToken(count);
     var paymentID = await getPaymentId(paymentMethod, point);
-    await CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
+    await CRUD().postWallet(link: AppLink.addDriversWalletPoints, payload: {
       'driverID': box.read(BoxName.driverID).toString(),
       'paymentID': paymentID.toString(),
       'amount': point,
@@ -183,7 +188,7 @@ class CaptainWalletController extends GetxController {
   Future addDriverPayment(String paymentMethod, point, wayPay) async {
     paymentToken = await generateToken(point);
     var paymentID = await getPaymentId(paymentMethod, point.toString());
-    await CRUD().post(link: AppLink.addDrivePayment, payload: {
+    await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
       'amount': point.toString(),
       'rideId': paymentID.toString(),
       'payment_method': paymentMethod,
@@ -195,7 +200,7 @@ class CaptainWalletController extends GetxController {
 
   Future addDriverWalletFromPromo(String paymentMethod, point) async {
     var resPromotion =
-        await CRUD().post(link: AppLink.addpromotionDriver, payload: {
+        await CRUD().postWallet(link: AppLink.addpromotionDriver, payload: {
       'driver_id': box.read(BoxName.driverID).toString(),
       'payment_amount': point,
       'timePromo': paymentMethod,
@@ -203,7 +208,8 @@ class CaptainWalletController extends GetxController {
     if (resPromotion != 'failure') {
       paymentToken = await generateToken(point);
       var paymentID = await getPaymentId(paymentMethod, point.toString());
-      var res = await CRUD().post(link: AppLink.addDrivePayment, payload: {
+      var res =
+          await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
         'amount': point,
         'rideId': paymentID.toString(),
         'payment_method': paymentMethod.toString(),
@@ -231,7 +237,7 @@ class CaptainWalletController extends GetxController {
   Future addDriverWalletToInvitor(String paymentMethod, driverID, point) async {
     paymentToken = await generateToken(point);
     var paymentID = await getPaymentId(paymentMethod, point.toString());
-    await CRUD().post(link: AppLink.addDrivePayment, payload: {
+    await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
       'driverID': driverID,
       'amount': point,
       'token': paymentToken,
@@ -244,7 +250,7 @@ class CaptainWalletController extends GetxController {
 
   Future addSeferWallet(String paymentMethod, String point) async {
     var seferToken = await generateToken(point.toString());
-    await CRUD().post(link: AppLink.addSeferWallet, payload: {
+    await CRUD().postWallet(link: AppLink.addSeferWallet, payload: {
       'amount': point.toString(),
       'paymentMethod': paymentMethod,
       'passengerId': 'driver',
@@ -259,7 +265,7 @@ class CaptainWalletController extends GetxController {
     paymentToken = await generateToken(
         (int.parse(amountFromBudgetController.text) * -1).toString());
 
-    await CRUD().post(link: AppLink.addDrivePayment, payload: {
+    await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
       'amount': (int.parse(amountFromBudgetController.text) * -1).toString(),
       'rideId': paymentID.toString(),
       'payment_method': paymentMethod1,
@@ -272,7 +278,7 @@ class CaptainWalletController extends GetxController {
         (int.parse(amountFromBudgetController.text) - 5).toString());
     paymentToken = await generateToken(amountFromBudgetController.text);
     var res1 =
-        await CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
+        await CRUD().postWallet(link: AppLink.addDriversWalletPoints, payload: {
       'driverID': amountToNewDriverMap[0]['id'].toString(),
       'paymentID': paymentID.toString(),
       'amount': ((int.parse(amountFromBudgetController.text) - 5))

lib/controller/home/payment/paymob_payout.dart

@@ -1,10 +1,9 @@
 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/constant/colors.dart';
 import 'package:sefer_driver/main.dart';
-import 'package:sefer_driver/print.dart';
 import 'package:sefer_driver/views/widgets/error_snakbar.dart';
 import 'package:get/get.dart';
 import 'package:http/http.dart' as http;
@@ -12,6 +11,7 @@ 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';
 import 'captain_wallet_controller.dart';
 
@@ -52,56 +52,78 @@ class PaymobPayout extends GetxController {
   int payOutFee = 5;
   payToDriverWallet(
       String token, String amount, String issuer, String msisdn) async {
-    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);
-    if (dec['disbursement_status'] == 'successful') {
-      var paymentToken = await Get.find<CaptainWalletController>()
-          .generateToken(
-              ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
-                  .toStringAsFixed(0));
-      await CRUD().post(link: AppLink.addDrivePayment, payload: {
-        'rideId': DateTime.now().toIso8601String(),
-        'amount': ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
-            .toStringAsFixed(0),
-        'payment_method': 'payout',
-        'passengerID': 'myself',
-        'token': paymentToken,
-        'driverID': box.read(BoxName.driverID).toString(),
+    bool isAvailable = await LocalAuthentication().isDeviceSupported();
+    if (isAvailable) {
+      // Authenticate the user
+      bool didAuthenticate = await LocalAuthentication().authenticate(
+          localizedReason: 'Use Touch ID or Face ID to confirm payment',
+          options: AuthenticationOptions(
+            biometricOnly: true,
+            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);
+        if (dec['disbursement_status'] == 'successful') {
+          var paymentToken = await Get.find<CaptainWalletController>()
+              .generateToken(
+                  ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
+                      .toStringAsFixed(0));
+          await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
+            'rideId': DateTime.now().toIso8601String(),
+            'amount':
+                ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
+                    .toStringAsFixed(0),
+            'payment_method': 'payout',
+            'passengerID': 'myself',
+            'token': paymentToken,
+            'driverID': box.read(BoxName.driverID).toString(),
+          });
+          await Get.find<CaptainWalletController>()
+              .addSeferWallet('payout fee myself', payOutFee.toString());
+          await updatePaymentToPaid(box.read(BoxName.driverID).toString());
+          await sendEmail(
+              box.read(BoxName.driverID).toString(),
+              amount,
+              box.read(BoxName.phoneDriver).toString(),
+              box.read(BoxName.nameDriver).toString(),
+              'Wallet',
+              box.read(BoxName.emailDriver).toString());
+
+          mySnackbarSuccess('${'Transaction successful'.tr} ${dec['amount']}');
+
+          Get.find<CaptainWalletController>().refreshCaptainWallet();
+        } else if (dec['disbursement_status'] == 'failed') {
+          mySnackeBarError('Transaction failed'.tr);
+        }
+      } else {
+        MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
+          Get.back();
+        });
+      }
+    } else {
+      MyDialog().getDialog('Biometric Authentication'.tr,
+          'You should use Touch ID or Face ID to confirm payment'.tr, () {
+        Get.back();
       });
-      await Get.find<CaptainWalletController>()
-          .addSeferWallet('payout fee myself', payOutFee.toString());
-      await updatePaymentToPaid(box.read(BoxName.driverID).toString());
-      await sendEmail(
-          box.read(BoxName.driverID).toString(),
-          amount,
-          box.read(BoxName.phoneDriver).toString(),
-          box.read(BoxName.nameDriver).toString(),
-          'Wallet',
-          box.read(BoxName.emailDriver).toString());
-
-      mySnackbarSuccess('${'Transaction successful'.tr} ${dec['amount']}');
-
-      Get.find<CaptainWalletController>().refreshCaptainWallet();
-    } else if (dec['disbursement_status'] == 'failed') {
-      mySnackeBarError('Transaction failed'.tr);
     }
   }
 
   Future updatePaymentToPaid(String driverID) async {
-    await CRUD().post(link: AppLink.updatePaymetToPaid, payload: {
+    await CRUD().postWallet(link: AppLink.updatePaymetToPaid, payload: {
       'driverID': driverID.toString(),
     });
   }
@@ -129,66 +151,130 @@ class PaymobPayout extends GetxController {
 
   payToDriverBankAccount(String token, String amount, String bankCardNumber,
       String bankCode) async {
-    var headers = {
-      'Authorization': 'Bearer $token',
-      'Content-Type': 'application/json',
-    };
-    var body = {
-      "issuer": "bank_card",
-      "amount": amount, //9.0,
-      "full_name":
-          '${box.read(BoxName.nameDriver)} ${box.read(BoxName.lastNameDriver)}',
-      "bank_card_number": bankCardNumber, //"1111-2222-3333-4444",
-      "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 = jsonDecode(res.body);
-    if (dec['disbursement_status'] == 'successful') {
-      var paymentToken = await Get.find<CaptainWalletController>()
-          .generateToken(
-              ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
-                  .toStringAsFixed(0));
-      await CRUD().post(link: AppLink.addDrivePayment, payload: {
-        'rideId': DateTime.now().toIso8601String(),
-        'amount': ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
-            .toStringAsFixed(0),
-        'payment_method': 'payout',
-        'passengerID': 'myself',
-        'token': paymentToken,
-        'driverID': box.read(BoxName.driverID).toString(),
-      });
-      await Get.find<CaptainWalletController>()
-          .addSeferWallet('payout fee myself', payOutFee.toString());
-      await updatePaymentToPaid(box.read(BoxName.driverID).toString());
-      await sendEmail(
-          box.read(BoxName.driverID).toString(),
-          amount,
-          box.read(BoxName.phoneDriver).toString(),
-          box.read(BoxName.nameDriver).toString(),
-          'Wallet',
-          box.read(BoxName.emailDriver).toString());
+    bool isAvailable = await LocalAuthentication().isDeviceSupported();
+    if (isAvailable) {
+      // Authenticate the user
+      bool didAuthenticate = await LocalAuthentication().authenticate(
+          localizedReason: 'Use Touch ID or Face ID to confirm payment',
+          options: AuthenticationOptions(
+            biometricOnly: true,
+            sensitiveTransaction: true,
+          ));
+      if (didAuthenticate) {
+        var headers = {
+          'Authorization': 'Bearer $token',
+          'Content-Type': 'application/json',
+        };
+        var body = {
+          "issuer": "bank_card",
+          "amount": amount, //9.0,
+          "full_name":
+              '${box.read(BoxName.nameDriver)} ${box.read(BoxName.lastNameDriver)}',
+          "bank_card_number": bankCardNumber, //"1111-2222-3333-4444",
+          "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 = jsonDecode(res.body);
+        if (dec['disbursement_status'] == 'successful') {
+          var paymentToken = await Get.find<CaptainWalletController>()
+              .generateToken(
+                  ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
+                      .toStringAsFixed(0));
+          await CRUD().postWallet(link: AppLink.addDrivePayment, payload: {
+            'rideId': DateTime.now().toIso8601String(),
+            'amount':
+                ((-1) * (double.parse(dec['amount'].toString())) - payOutFee)
+                    .toStringAsFixed(0),
+            'payment_method': 'payout',
+            'passengerID': 'myself',
+            'token': paymentToken,
+            'driverID': box.read(BoxName.driverID).toString(),
+          });
+          await Get.find<CaptainWalletController>()
+              .addSeferWallet('payout fee myself', payOutFee.toString());
+          await updatePaymentToPaid(box.read(BoxName.driverID).toString());
+          await sendEmail(
+              box.read(BoxName.driverID).toString(),
+              amount,
+              box.read(BoxName.phoneDriver).toString(),
+              box.read(BoxName.nameDriver).toString(),
+              'Wallet',
+              box.read(BoxName.emailDriver).toString());
 
-      mySnackbarSuccess('${'Transaction successful'.tr} ${dec['amount']}');
-      Get.find<CaptainWalletController>().refreshCaptainWallet();
-    } else if (dec['disbursement_status'] == 'failed') {
-      mySnackeBarError('Transaction failed'.tr);
+          mySnackbarSuccess('${'Transaction successful'.tr} ${dec['amount']}');
+          Get.find<CaptainWalletController>().refreshCaptainWallet();
+        } else if (dec['disbursement_status'] == 'failed') {
+          mySnackeBarError('Transaction failed'.tr);
+        }
+      } else {
+        MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
+          Get.back();
+        });
+      }
+    } else {
+      MyDialog().getDialog('Biometric Authentication'.tr,
+          'You should use Touch ID or Face ID to confirm payment'.tr, () {
+        Get.back();
+      });
     }
   }
 
   Future payToWalletDriverAll(
       String amount, String issuer, String msisdn) async {
-    String token = await getToken();
-    await payToDriverWallet(token, amount, issuer, msisdn);
+    bool isAvailable = await LocalAuthentication().isDeviceSupported();
+    if (isAvailable) {
+      // Authenticate the user
+      bool didAuthenticate = await LocalAuthentication().authenticate(
+          localizedReason: 'Use Touch ID or Face ID to confirm payment',
+          options: AuthenticationOptions(
+            biometricOnly: true,
+            sensitiveTransaction: true,
+          ));
+      if (didAuthenticate) {
+        String token = await getToken();
+        await payToDriverWallet(token, amount, issuer, msisdn);
+      } else {
+        MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
+          Get.back();
+        });
+      }
+    } else {
+      MyDialog().getDialog('Biometric Authentication'.tr,
+          'You should use Touch ID or Face ID to confirm payment'.tr, () {
+        Get.back();
+      });
+    }
   }
 
   Future payToBankDriverAll(
       String amount, String bankCardNumber, String bankCode) async {
-    String token = await getToken();
-    await payToDriverBankAccount(token, amount, bankCardNumber, bankCode);
+    bool isAvailable = await LocalAuthentication().isDeviceSupported();
+    if (isAvailable) {
+      // Authenticate the user
+      bool didAuthenticate = await LocalAuthentication().authenticate(
+          localizedReason: 'Use Touch ID or Face ID to confirm payment',
+          options: AuthenticationOptions(
+            biometricOnly: true,
+            sensitiveTransaction: true,
+          ));
+      if (didAuthenticate) {
+        String token = await getToken();
+        await payToDriverBankAccount(token, amount, bankCardNumber, bankCode);
+      } else {
+        MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
+          Get.back();
+        });
+      }
+    } else {
+      MyDialog().getDialog('Biometric Authentication'.tr,
+          'You should use Touch ID or Face ID to confirm payment'.tr, () {
+        Get.back();
+      });
+    }
   }
 }