diff --git a/android/build.gradle b/android/build.gradle
index 216e3bd..6f00cdb 100644
--- a/android/build.gradle
+++ b/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'
diff --git a/assets/images/logo.gif b/assets/images/logo.gif
index 3eee779..64ca1be 100644
Binary files a/assets/images/logo.gif and b/assets/images/logo.gif differ
diff --git a/assets/images/logo.png b/assets/images/logo.png
index 3073bc1..19f52d2 100644
Binary files a/assets/images/logo.png and b/assets/images/logo.png differ
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index dfb2a0e..8ff583b 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -37,11 +37,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 33
+ 34
CFBundleSignature
????
CFBundleVersion
- 1.5.33
+ 1.5.34
FirebaseAppDelegateProxyEnabled
NO
GMSApiKey
diff --git a/lib/constant/links.dart b/lib/constant/links.dart
index 8e4fd90..53f0045 100644
--- a/lib/constant/links.dart
+++ b/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";
diff --git a/lib/constant/style.dart b/lib/constant/style.dart
index 963bbb4..8b4f0e2 100644
--- a/lib/constant/style.dart
+++ b/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(
diff --git a/lib/controller/payment/payment_controller.dart b/lib/controller/payment/payment_controller.dart
index 29d83ad..de37042 100644
--- a/lib/controller/payment/payment_controller.dart
+++ b/lib/controller/payment/payment_controller.dart
@@ -62,8 +62,9 @@ class PaymentController extends GetxController {
}
String paymentToken = '';
- Future generateToken(String amount) async {
- var res = await CRUD().post(link: AppLink.addPaymentToken, payload: {
+ Future 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 generateTokenDriver(String amount) async {
+ var res = await CRUD().post(link: AppLink.addPaymentTokenDriver, payload: {
+ 'driverID': Get.find().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();
diff --git a/lib/controller/rate/rate_conroller.dart b/lib/controller/rate/rate_conroller.dart
index 889156e..45052c5 100644
--- a/lib/controller/rate/rate_conroller.dart
+++ b/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().isWalletChecked == true) {
- var tip = (Get.find().totalPassenger) *
- (double.parse(box.read(BoxName.tipPercentage.toString())));
+ double tip = 0;
+ tip = (Get.find().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().driverId.toString(),
'rideID': Get.find().rideId.toString(),
'tipAmount': tip.toString(),
});
+ var token = await Get.find()
+ .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().driverId.toString(),
- 'paymentID': '${Get.find().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().generateTokenDriver(
+ box.read(BoxName.countryCode) == 'Egypt'
+ ? tip.toStringAsFixed(0)
+ : (tip * 100).toString());
+ await CRUD().post(link: AppLink.addDriversWalletPoints, payload: {
+ 'driverID': Get.find().driverId.toString(),
+ 'paymentID': '${Get.find().rideId}tip',
+ 'amount': box.read(BoxName.countryCode) == 'Egypt'
+ ? tip.toStringAsFixed(0)
+ : (tip * 100).toString(),
+ 'paymentMethod': 'visa-tip',
+ 'token': token1,
+ });
+ }
if (res != 'failure') {
FirebaseMessagesController().sendNotificationToAnyWithoutData(