6/18/2

android/build.gradle

@@ -7,6 +7,9 @@ buildscript {
 
     dependencies {
         // START: FlutterFire Configuration
+//        classpath 'com.google.gms:google-services:4.4.2'
+//        // END: FlutterFire Configuration
+//        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.google.gms:google-services:4.3.15'
         // END: FlutterFire Configuration
         classpath 'com.android.tools.build:gradle:7.3.0'

ios/Runner/Info.plist

@@ -37,11 +37,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>33</string>
+	<string>34</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.33</string>
+	<string>1.5.34</string>
 	<key>FirebaseAppDelegateProxyEnabled</key>
 	<string>NO</string>
 	<key>GMSApiKey</key>

lib/constant/links.dart

@@ -23,6 +23,9 @@ class AppLink {
   static String getPassengersWallet = "$wallet/get.php";
   static String getPassengerWalletArchive =
       "$wallet/getPassengerWalletArchive.php";
+
+  static String addDrivePayment = "$ride/payment/add.php";
+  static String addSeferWallet = "$ride/seferWallet/add.php";
   static String addPassengersWallet = "$wallet/add.php";
   static String deletePassengersWallet = "$wallet/delete.php";
   static String updatePassengersWallet = "$wallet/update.php";
@@ -68,8 +71,10 @@ class AppLink {
 ////-----------------DriverPayment------------------
   static String addDriverpayment = "$ride/payment/add.php";
   static String addDriverPaymentPoints = "$ride/driverPayment/add.php";
-  static String addPaymentToken =
+  static String addPaymentTokenPassenger =
       "$ride/passengerWallet/addPaymentTokenPassenger.php";
+  static String addPaymentTokenDriver =
+      "$ride/driverWallet/addPaymentToken.php";
   static String getDriverPaymentPoints = "$ride/driverWallet/get.php";
   static String getDriverpaymentToday = "$ride/payment/get.php";
   static String getCountRide = "$ride/payment/getCountRide.php";

lib/constant/style.dart

@@ -11,28 +11,28 @@ class AppStyle {
       color: AppColor.accentColor,
       fontFamily: box.read(BoxName.lang) == 'ar'
           ? 'mohanad'
-          : GoogleFonts.josefinSans().fontFamily);
+          : GoogleFonts.roboto().fontFamily);
   static TextStyle headTitle2 = TextStyle(
       fontWeight: FontWeight.bold,
       fontSize: 26,
       color: AppColor.writeColor,
       fontFamily: box.read(BoxName.lang) == 'ar'
           ? 'mohanad'
-          : GoogleFonts.josefinSans().fontFamily);
+          : GoogleFonts.roboto().fontFamily);
   static TextStyle title = TextStyle(
       fontWeight: FontWeight.normal,
       fontSize: box.read(BoxName.lang) == 'ar' ? 14 : 16,
       color: AppColor.writeColor,
       fontFamily: box.read(BoxName.lang) == 'ar'
           ? 'mohanad'
-          : GoogleFonts.josefinSans().fontFamily);
+          : GoogleFonts.roboto().fontFamily);
   static TextStyle subtitle = TextStyle(
       fontWeight: FontWeight.bold,
       fontSize: 13,
       color: AppColor.writeColor,
       fontFamily: box.read(BoxName.lang) == 'ar'
           ? 'mohanad'
-          : GoogleFonts.josefinSans().fontFamily);
+          : GoogleFonts.roboto().fontFamily);
   static TextStyle number = const TextStyle(
       fontWeight: FontWeight.bold,
       fontSize: 14,
@@ -55,7 +55,7 @@ class AppStyle {
       BoxShadow(
           color: AppColor.accentColor, blurRadius: 5, offset: Offset(2, 4)),
       BoxShadow(
-          color: AppColor.twitterColor, blurRadius: 5, offset: Offset(-2, -2))
+          color: AppColor.accentColor, blurRadius: 5, offset: Offset(-2, -2))
     ],
     color: AppColor.secondaryColor,
     borderRadius: BorderRadius.all(

lib/controller/payment/payment_controller.dart

@@ -62,8 +62,9 @@ class PaymentController extends GetxController {
   }
 
   String paymentToken = '';
-  Future<String> generateToken(String amount) async {
-    var res = await CRUD().post(link: AppLink.addPaymentToken, payload: {
+  Future<String> generateTokenPassenger(String amount) async {
+    var res =
+        await CRUD().post(link: AppLink.addPaymentTokenPassenger, payload: {
       'passengerId': box.read(BoxName.passengerID).toString(),
       'amount': amount.toString(),
     });
@@ -72,15 +73,42 @@ class PaymentController extends GetxController {
     return d['message'];
   }
 
+  Future<String> generateTokenDriver(String amount) async {
+    var res = await CRUD().post(link: AppLink.addPaymentTokenDriver, payload: {
+      'driverID': Get.find<MapPassengerController>().driverId,
+      'amount': amount.toString(),
+    });
+    var d = jsonDecode(res);
+    print('paymentToken ${d['message']}');
+    return d['message'];
+  }
+
   addPassengerWallet() async {
     isLoading = true;
     update();
-    paymentToken = await generateToken(selectedAmount.toString());
+
     // double sallaryAccountNowBeforeAdding =
     //     double.parse(box.read(BoxName.passengerWalletTotal).toString());
+    var seferToken = await generateTokenPassenger(selectedAmount.toString());
+    await CRUD().post(link: AppLink.addSeferWallet, payload: {
+      'amount': selectedAmount.toString(),
+      'paymentMethod': 'payout fee',
+      'passengerId': box.read(BoxName.passengerID).toString(),
+      'token': seferToken,
+      'driverId': 'passenger',
+    });
+    paymentToken = await generateTokenPassenger(selectedAmount.toString());
     await CRUD().post(link: AppLink.addPassengersWallet, payload: {
       'passenger_id': box.read(BoxName.passengerID).toString(),
-      'balance': selectedAmount.toString(),
+      'balance': selectedAmount == 100
+          ? '100'
+          : selectedAmount == 200
+              ? '215'
+              : selectedAmount == 400
+                  ? '450'
+                  : selectedAmount == 1000
+                      ? '1140'
+                      : '0',
       'token': paymentToken,
     }).then((value) {
       getPassengerWallet();

lib/controller/rate/rate_conroller.dart

@@ -26,7 +26,7 @@ class RateController extends GetxController {
     rideId = Get.arguments['rideId'];
     driverId = Get.arguments['driverId'];
     price = Get.arguments['price'];
-
+    box.write(BoxName.tipPercentage, 0.0);
     super.onInit();
   }
 
@@ -80,27 +80,37 @@ class RateController extends GetxController {
           middleText: '',
           confirm: MyElevatedButton(title: 'Ok', onPressed: () => Get.back()));
     } else if (Get.find<PaymentController>().isWalletChecked == true) {
-      var tip = (Get.find<MapPassengerController>().totalPassenger) *
-          (double.parse(box.read(BoxName.tipPercentage.toString())));
+      double tip = 0;
+      tip = (Get.find<MapPassengerController>().totalPassenger) *
+          (double.parse(box.read(BoxName.tipPercentage).toString()));
       var res = await CRUD().post(link: AppLink.addTips, payload: {
         'passengerID': box.read(BoxName.passengerID),
         'driverID': Get.find<MapPassengerController>().driverId.toString(),
         'rideID': Get.find<MapPassengerController>().rideId.toString(),
         'tipAmount': tip.toString(),
       });
+      var token = await Get.find<PaymentController>()
+          .generateTokenPassenger(((-1) * tip).toString());
       await CRUD().post(link: AppLink.addPassengersWallet, payload: {
         'passenger_id': box.read(BoxName.passengerID).toString(),
-        'balance': ((-1) * tip).toString()
-      });
-
-      await CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
-        'driverID': Get.find<MapPassengerController>().driverId.toString(),
-        'paymentID': '${Get.find<MapPassengerController>().rideId}tip',
-        'amount': box.read(BoxName.countryCode) == 'Egypt'
-            ? tip.toStringAsFixed(0)
-            : (tip * 100).toString(),
-        'paymentMethod': 'visa-tip',
+        'balance': ((-1) * tip).toString(),
+        'token': token,
       });
+      if (tip > 0) {
+        var token1 = await Get.find<PaymentController>().generateTokenDriver(
+            box.read(BoxName.countryCode) == 'Egypt'
+                ? tip.toStringAsFixed(0)
+                : (tip * 100).toString());
+        await CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
+          'driverID': Get.find<MapPassengerController>().driverId.toString(),
+          'paymentID': '${Get.find<MapPassengerController>().rideId}tip',
+          'amount': box.read(BoxName.countryCode) == 'Egypt'
+              ? tip.toStringAsFixed(0)
+              : (tip * 100).toString(),
+          'paymentMethod': 'visa-tip',
+          'token': token1,
+        });
+      }
 
       if (res != 'failure') {
         FirebaseMessagesController().sendNotificationToAnyWithoutData(