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

passnger/5/2/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-05-02 15:14:20 +03:00
parent 4f2ccf6495
commit 725990ec4b
5 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
lib/controller/home/payment/captain_wallet_controller.dart
View File

@@ -30,57 +30,57 @@ class CaptainWalletController extends GetxController {
await addDriverWallet('fromBudget', pointFromBudget.toString());
update();
Get.back();
getCaptainWalletFromRide();
getCaptainWalletFromBuyPoints();
checkAccountCaptainBank();
// getCaptainWalletFromRide();
// getCaptainWalletFromBuyPoints();
// checkAccountCaptainBank();
}
}
Future getCaptainWalletFromRide() async {
isLoading = true;
update();
var res = await CRUD().get(
link: AppLink.getAllPaymentFromRide,
payload: {'driverID': box.read(BoxName.driverID)},
);
walletDate = jsonDecode(res);
totalAmount = walletDate['message'][0]['total_amount'].toString() == null
? '0'
: walletDate['message'][0]['total_amount'];
print(totalAmount);
// Future getCaptainWalletFromRide() async {
// isLoading = true;
// update();
// var res = await CRUD().get(
// link: AppLink.getAllPaymentFromRide,
// payload: {'driverID': box.read(BoxName.driverID)},
// );
// walletDate = jsonDecode(res);
// totalAmount = walletDate['message'][0]['total_amount'].toString() == null
// ? '0'
// : walletDate['message'][0]['total_amount'];
// print(totalAmount);
var res1 = await CRUD().get(
link: AppLink.getAllPaymentVisa,
payload: {'driverID': box.read(BoxName.driverID)});
walletDateVisa = jsonDecode(res1);
totalAmountVisa = walletDateVisa['message'][0]['diff'].toString() == null
? '0'
: walletDateVisa['message'][0]['diff'];
print(totalAmountVisa);
isLoading = false;
update();
}
// var res1 = await CRUD().get(
// link: AppLink.getAllPaymentVisa,
// payload: {'driverID': box.read(BoxName.driverID)});
// walletDateVisa = jsonDecode(res1);
// totalAmountVisa = walletDateVisa['message'][0]['diff'].toString() == null
// ? '0'
// : walletDateVisa['message'][0]['diff'];
// print(totalAmountVisa);
// isLoading = false;
// update();
// }
Future getCaptainWalletFromBuyPoints() async {
isLoading = true;
update();
var res = await CRUD().get(
link: AppLink.getDriverPaymentPoints,
payload: {'driverID': box.read(BoxName.driverID)},
);
walletDriverPointsDate = jsonDecode(res);
if (walletDriverPointsDate['message'][0]['driverID'].toString() ==
box.read(BoxName.driverID)) {
double totalPointsDouble = double.parse(
walletDriverPointsDate['message'][0]['total_amount'].toString());
totalPoints = totalPointsDouble.toStringAsFixed(0);
} else {
totalPoints = '0';
}
// Future getCaptainWalletFromBuyPoints() async {
// isLoading = true;
// update();
// var res = await CRUD().get(
// link: AppLink.getDriverPaymentPoints,
// payload: {'driverID': box.read(BoxName.driverID)},
// );
// walletDriverPointsDate = jsonDecode(res);
// if (walletDriverPointsDate['message'][0]['driverID'].toString() ==
// box.read(BoxName.driverID)) {
// double totalPointsDouble = double.parse(
// walletDriverPointsDate['message'][0]['total_amount'].toString());
// totalPoints = totalPointsDouble.toStringAsFixed(0);
// } else {
// totalPoints = '0';
// }
isLoading = false;
update();
}
// isLoading = false;
// update();
// }
late String paymentID;
Future addDriverPayment(String paymentMethod, amount) async {
@@ -123,9 +123,9 @@ class CaptainWalletController extends GetxController {
@override
void onInit() {
getCaptainWalletFromRide();
getCaptainWalletFromBuyPoints();
checkAccountCaptainBank();
// getCaptainWalletFromRide();
// getCaptainWalletFromBuyPoints();
// checkAccountCaptainBank();
super.onInit();
}
}

8
lib/views/home/map_widget.dart/points_page_for_rider.dart
View File

@@ -111,9 +111,11 @@ class PointsPageForRider extends StatelessWidget {
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(mapPassengerController
.currentLocationStringAll[index]
.toString()),
Text(index > 0
? mapPassengerController
.currentLocationStringAll[index]
.toString()
: ''),
const Icon(
Icons.reorder,
size: 20,

10
lib/views/home/my_wallet/points_captain.dart
View File

@@ -48,8 +48,8 @@ class PointsCaptain extends StatelessWidget {
'visa', pricePoint);
await captainWalletController.addDriverWallet(
'visa', countPoint);
await captainWalletController
.getCaptainWalletFromBuyPoints();
// await captainWalletController
// .getCaptainWalletFromBuyPoints();
});
}, //51524
),
@@ -69,8 +69,8 @@ class PointsCaptain extends StatelessWidget {
'visa', pricePoint);
await captainWalletController.addDriverWallet(
'visa', countPoint);
await captainWalletController
.getCaptainWalletFromBuyPoints();
// await captainWalletController
// .getCaptainWalletFromBuyPoints();
});
},
),
@@ -83,7 +83,7 @@ class PointsCaptain extends StatelessWidget {
'visa', pricePoint);
await captainWalletController.addDriverWallet(
'visa', countPoint);
await captainWalletController.getCaptainWalletFromBuyPoints();
// await captainWalletController.getCaptainWalletFromBuyPoints();
});
},
child: Container(

2
lib/views/home/my_wallet/walet_captain.dart
View File

@@ -397,7 +397,7 @@ class WalletCaptain extends StatelessWidget {
isleading: true,
action: InkWell(
onTap: () {
captainWalletController.getCaptainWalletFromBuyPoints();
// captainWalletController.getCaptainWalletFromBuyPoints();
},
child: const Icon(Icons.refresh)),
);

2
lib/views/home/profile/order_history.dart
View File

@@ -69,7 +69,7 @@ class OrderHistory extends StatelessWidget {
zoom: 15,
),
zoomControlsEnabled: true,
liteModeEnabled: true,
// liteModeEnabled: false,
polylines: {
Polyline(
zIndex: 2,