Hamza/tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6/19/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-06-19 02:38:56 +03:00
parent aeb4164d5d
commit edb05caa13
4 changed files with 50 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/controller/firebase/firbase_messge.dart
View File

@@ -381,33 +381,6 @@ class FirebaseMessagesController extends GetxController {
confirm: MyElevatedButton(
title: 'Yes'.tr,
onPressed: () async {
var 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': driverList[0].toString(),
'rideID': driverList[1].toString(),
'tipAmount': 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': driverList[0].toString(),
'paymentID': '${Get.find<MapPassengerController>().rideId}tip',
'amount': (tip * 100).toString(),
'paymentMethod': 'visa-tip',
});
if (res != 'failure') {
FirebaseMessagesController().sendNotificationToAnyWithoutData(
'You Have Tips',
'${'${tip.toString()}\$${' tips\nTotal is'.tr}'} ${tip + (Get.find<MapPassengerController>().totalPassenger)}',
driverList[2].toString(),
);
}
Get.to(() => RateDriverFromPassenger(), arguments: {
'driverId': driverList[0].toString(),
'rideId': driverList[1].toString(),

63
lib/controller/payment/payment_controller.dart
View File

@@ -79,43 +79,46 @@ class PaymentController extends GetxController {
'amount': amount.toString(),
});
var d = jsonDecode(res);
print('paymentToken ${d['message']}');
// print('paymentToken ${d['message']}');
return d['message'];
}
Future addSeferWallet(String paymentMethod, point) async {
var seferToken = await generateTokenDriver(point);
await CRUD().post(link: AppLink.addSeferWallet, payload: {
'amount': point.toString(),
'paymentMethod': paymentMethod,
'passengerId': box.read(BoxName.passengerID).toString(),
'token': seferToken,
'driverId': 'passenger',
});
}
Future addPassengersWallet(String point) async {
var token = await generateTokenPassenger(point);
await CRUD().post(link: AppLink.addPassengersWallet, payload: {
'passenger_id': box.read(BoxName.passengerID).toString(),
'balance': point,
'token': token,
});
}
addPassengerWallet() async {
isLoading = true;
update();
// 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 == 100
? '100'
: selectedAmount == 200
? '215'
: selectedAmount == 400
? '450'
: selectedAmount == 1000
? '1140'
: '0',
'token': paymentToken,
}).then((value) {
getPassengerWallet();
// sallaryAccountNowBeforeAdding = sallaryAccountNowBeforeAdding +
// double.parse(selectedAmount.toString());
// box.write(BoxName.passengerWalletTotal, sallaryAccountNowBeforeAdding);
});
await addSeferWallet('visa-in', selectedAmount.toString());
await addPassengersWallet(selectedAmount == 100
? '100'
: selectedAmount == 200
? '215'
: selectedAmount == 400
? '450'
: selectedAmount == 1000
? '1140'
: '0');
getPassengerWallet();
isLoading = false;
update();

76
lib/controller/rate/rate_conroller.dart
View File

@@ -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);
box.write(BoxName.tipPercentage, '0');
super.onInit();
}
@@ -35,43 +35,6 @@ class RateController extends GetxController {
update();
}
// void addRateToPassenger() async {
// // HomeCaptainController homeCaptainController =
// // Get.find<HomeCaptainController>();
// // Get.put(MapDriverController());
// if (selectedRateItemId < 1) {
// Get.defaultDialog(
// title: 'You Should choose rate figure'.tr,
// titleStyle: AppStyle.title,
// middleText: '',
// confirm: MyElevatedButton(title: 'Ok', onPressed: () => Get.back()));
// } else {
// await CRUD().post(link: AppLink.addRateToPassenger, payload: {
// 'passenger_id': passengerId,
// 'driverID': box.read(BoxName.driverID).toString(),
// 'rideId': rideId,
// 'rating': selectedRateItemId.toString(),
// 'comment': comment.text,
// });
// await CRUD().sendEmail(AppLink.sendEmailToPassengerForTripDetails, {
// 'startLocation':
// Get.find<MapDriverController>().passengerLocation.toString(),
// 'endLocation':
// Get.find<MapDriverController>().passengerDestination.toString(),
// 'name': Get.find<MapDriverController>().passengerName.toString(),
// 'timeOfTrip': Get.find<MapDriverController>().timeOfOrder.toString(),
// 'fee': Get.find<MapDriverController>().totalPassenger.toString(),
// 'duration': Get.find<MapDriverController>().duration.toString(),
// 'phone': Get.find<MapDriverController>().passengerPhone.toString(),
// 'email': Get.find<MapDriverController>().passengerEmail.toString(),
// });
// // homeCaptainController.isActive = true;
// // update();
// // homeCaptainController.getPaymentToday();
// Get.offAll(HomeCaptain());
// }
// }
void addRateToDriver() async {
if (selectedRateItemId < 1) {
Get.defaultDialog(
@@ -83,20 +46,16 @@ class RateController extends GetxController {
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(),
'token': token,
});
if (tip > 0) {
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(),
});
await Get.find<PaymentController>()
.addPassengersWallet(((-1) * tip).toString());
var token1 = await Get.find<PaymentController>().generateTokenDriver(
box.read(BoxName.countryCode) == 'Egypt'
? tip.toStringAsFixed(0)
@@ -110,14 +69,13 @@ class RateController extends GetxController {
'paymentMethod': 'visa-tip',
'token': token1,
});
}
if (res != 'failure') {
FirebaseMessagesController().sendNotificationToAnyWithoutData(
'You Have Tips',
'${'${tip.toString()}\$${' tips\nTotal is'.tr}'} ${tip + (Get.find<MapPassengerController>().totalPassenger)}',
Get.find<MapPassengerController>().driverToken.toString(),
);
if (res != 'failure') {
FirebaseMessagesController().sendNotificationToAnyWithoutData(
'You Have Tips',
'${'${tip.toString()}\$${' tips\nTotal is'.tr}'} ${tip + (Get.find<MapPassengerController>().totalPassenger)}',
Get.find<MapPassengerController>().driverToken.toString(),
);
}
}
}
await CRUD().post(link: AppLink.addRateToDriver, payload: {

2
lib/views/Rate/rate_captain.dart
View File

@@ -3,13 +3,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:get/get.dart';
import '../../constant/box_name.dart';
import '../../constant/colors.dart';
import '../../constant/style.dart';
import '../../controller/firebase/firbase_messge.dart';
import '../../controller/payment/payment_controller.dart';
import '../../controller/rate/rate_conroller.dart';
import '../../main.dart';
import '../widgets/elevated_btn.dart';
import '../widgets/my_scafold.dart';