From 725990ec4bb054ab4cc5911aa09d71b005a7a656 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Thu, 2 May 2024 15:14:20 +0300 Subject: [PATCH] passnger/5/2/1 --- .../payment/captain_wallet_controller.dart | 96 +++++++++---------- .../points_page_for_rider.dart | 8 +- lib/views/home/my_wallet/points_captain.dart | 10 +- lib/views/home/my_wallet/walet_captain.dart | 2 +- lib/views/home/profile/order_history.dart | 2 +- 5 files changed, 60 insertions(+), 58 deletions(-) diff --git a/lib/controller/home/payment/captain_wallet_controller.dart b/lib/controller/home/payment/captain_wallet_controller.dart index d5da05d..3b871f3 100644 --- a/lib/controller/home/payment/captain_wallet_controller.dart +++ b/lib/controller/home/payment/captain_wallet_controller.dart @@ -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(); } } diff --git a/lib/views/home/map_widget.dart/points_page_for_rider.dart b/lib/views/home/map_widget.dart/points_page_for_rider.dart index 412fe5b..de97751 100644 --- a/lib/views/home/map_widget.dart/points_page_for_rider.dart +++ b/lib/views/home/map_widget.dart/points_page_for_rider.dart @@ -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, diff --git a/lib/views/home/my_wallet/points_captain.dart b/lib/views/home/my_wallet/points_captain.dart index 1a2bc84..9e8b0f3 100644 --- a/lib/views/home/my_wallet/points_captain.dart +++ b/lib/views/home/my_wallet/points_captain.dart @@ -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( diff --git a/lib/views/home/my_wallet/walet_captain.dart b/lib/views/home/my_wallet/walet_captain.dart index 9c18ec0..741971d 100644 --- a/lib/views/home/my_wallet/walet_captain.dart +++ b/lib/views/home/my_wallet/walet_captain.dart @@ -397,7 +397,7 @@ class WalletCaptain extends StatelessWidget { isleading: true, action: InkWell( onTap: () { - captainWalletController.getCaptainWalletFromBuyPoints(); + // captainWalletController.getCaptainWalletFromBuyPoints(); }, child: const Icon(Icons.refresh)), ); diff --git a/lib/views/home/profile/order_history.dart b/lib/views/home/profile/order_history.dart index 0d10ea1..932d9d5 100644 --- a/lib/views/home/profile/order_history.dart +++ b/lib/views/home/profile/order_history.dart @@ -69,7 +69,7 @@ class OrderHistory extends StatelessWidget { zoom: 15, ), zoomControlsEnabled: true, - liteModeEnabled: true, + // liteModeEnabled: false, polylines: { Polyline( zIndex: 2,