From 1cc0156cfded6255a5e939ac603050d785442135 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Thu, 20 Jun 2024 00:08:36 +0300 Subject: [PATCH] 6/20/1 --- lib/controller/functions/crud.dart | 4 +-- .../payment/captain_wallet_controller.dart | 30 ++++++++++--------- lib/controller/local/translations.dart | 2 ++ .../home/my_wallet/card_wallet_widget.dart | 2 +- lib/views/home/my_wallet/points_captain.dart | 8 ++--- lib/views/home/my_wallet/walet_captain.dart | 12 +++++++- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index 8f53ebb..39123ce 100644 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -27,9 +27,9 @@ class CRUD { 'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials.toString()))}', }, ); - // print("-----request----" + response.request.toString()); + print("-----request----" + response.request.toString()); // print("-----headers-----" + response.headers.toString()); - // print("-----payload-----" + payload.toString()); + print("-----payload-----" + payload.toString()); // if (response.statusCode == 200) { // print(response.body); var jsonData = jsonDecode(response.body); diff --git a/lib/controller/home/payment/captain_wallet_controller.dart b/lib/controller/home/payment/captain_wallet_controller.dart index acac9ea..6cfb619 100644 --- a/lib/controller/home/payment/captain_wallet_controller.dart +++ b/lib/controller/home/payment/captain_wallet_controller.dart @@ -44,7 +44,7 @@ class CaptainWalletController extends GetxController { Future refreshCaptainWallet() async { await getCaptainWalletFromRide(); await getCaptainWalletFromBuyPoints(); - await checkAccountCaptainBank(); + // await checkAccountCaptainBank(); } List amountToNewDriverMap = []; @@ -95,18 +95,20 @@ class CaptainWalletController extends GetxController { payload: {'driverID': box.read(BoxName.driverID)}, ); isLoading = false; - walletDate = jsonDecode(res); - totalAmount = walletDate['message'][0]['total_amount'] ?? '0'; - print(totalAmount); + if (res != 'failure') { + walletDate = jsonDecode(res); + totalAmount = walletDate['message'][0]['total_amount'] ?? '0'; + print(totalAmount); - var res1 = await CRUD().get( - link: AppLink.getAllPaymentVisa, - payload: {'driverID': box.read(BoxName.driverID)}); - walletDateVisa = jsonDecode(res1); - totalAmountVisa = walletDateVisa['message'][0]['diff'] ?? '0'; - print(totalAmountVisa); + var res1 = await CRUD().get( + link: AppLink.getAllPaymentVisa, + payload: {'driverID': box.read(BoxName.driverID)}); + walletDateVisa = jsonDecode(res1); + totalAmountVisa = walletDateVisa['message'][0]['diff'] ?? '0'; + print(totalAmountVisa); - update(); + update(); + } } Future getCaptainWalletFromBuyPoints() async { @@ -168,8 +170,8 @@ class CaptainWalletController extends GetxController { }); } - Future addSeferWallet(String paymentMethod, point) async { - var seferToken = await generateToken(point); + Future addSeferWallet(String paymentMethod, String point) async { + var seferToken = await generateToken(point.toString()); await CRUD().post(link: AppLink.addSeferWallet, payload: { 'amount': point.toString(), 'paymentMethod': paymentMethod, @@ -251,7 +253,7 @@ class CaptainWalletController extends GetxController { void onInit() { getCaptainWalletFromRide(); getCaptainWalletFromBuyPoints(); - checkAccountCaptainBank(); + // checkAccountCaptainBank(); super.onInit(); } } diff --git a/lib/controller/local/translations.dart b/lib/controller/local/translations.dart index 975ed63..704c238 100644 --- a/lib/controller/local/translations.dart +++ b/lib/controller/local/translations.dart @@ -4,6 +4,8 @@ class MyTranslation extends Translations { @override Map> get keys => { "ar": { + "You don't have enough money in your SEFER wallet": + "لا يوجد رصيد كافٍ في محفظة SEFER الخاصة بك ", "You have transferred to your wallet from": "لقد حولت إلى محفظتك من", 'Transfer': "تحويل", "amount": "المبلغ", diff --git a/lib/views/home/my_wallet/card_wallet_widget.dart b/lib/views/home/my_wallet/card_wallet_widget.dart index f501c2d..42cf8c4 100644 --- a/lib/views/home/my_wallet/card_wallet_widget.dart +++ b/lib/views/home/my_wallet/card_wallet_widget.dart @@ -149,7 +149,7 @@ class CardSeferWalletDriver extends StatelessWidget { }, child: Container( width: Get.width * .85, - height: Get.height * .25, + height: Get.height * .27, decoration: BoxDecoration( color: AppColor.deepPurpleAccent, borderRadius: const BorderRadius.all(Radius.circular(12)), diff --git a/lib/views/home/my_wallet/points_captain.dart b/lib/views/home/my_wallet/points_captain.dart index 18e2ac9..0fa019e 100644 --- a/lib/views/home/my_wallet/points_captain.dart +++ b/lib/views/home/my_wallet/points_captain.dart @@ -39,7 +39,7 @@ class PointsCaptain extends StatelessWidget { style: AppStyle.title, ), MyElevatedButton( - title: '💳 Pay with Credit Card'.tr, + title: 'Pay with Credit Card'.tr, onPressed: () async { Get.back(); await paymentController.payWithPayMob( @@ -53,7 +53,7 @@ class PointsCaptain extends StatelessWidget { await captainWalletController.addDriverWallet( 'visa-in', countPoint); await captainWalletController.addSeferWallet( - 'visa-in', pricePoint); + 'visa-in', pricePoint.toString()); await captainWalletController .getCaptainWalletFromBuyPoints(); }); @@ -62,7 +62,7 @@ class PointsCaptain extends StatelessWidget { // Add some spacing between buttons MyElevatedButton( kolor: AppColor.redColor, - title: '💰 Pay with Wallet'.tr, + title: 'Pay with Wallet'.tr, onPressed: () async { Get.back(); await paymentController.payWithPayMobWallet( @@ -76,7 +76,7 @@ class PointsCaptain extends StatelessWidget { await captainWalletController.addDriverWallet( 'visa-in', countPoint); await captainWalletController.addSeferWallet( - 'visa-in', pricePoint); + 'visa-in', pricePoint.toString()); await captainWalletController .getCaptainWalletFromBuyPoints(); }); diff --git a/lib/views/home/my_wallet/walet_captain.dart b/lib/views/home/my_wallet/walet_captain.dart index c9765f5..2e26fd5 100644 --- a/lib/views/home/my_wallet/walet_captain.dart +++ b/lib/views/home/my_wallet/walet_captain.dart @@ -258,7 +258,17 @@ class WalletCaptain extends StatelessWidget { MyElevatedButton( title: 'Transfer budget'.tr, onPressed: () { - Get.to(() => const TransferBudgetPage()); + if (double.parse(captainWalletController + .totalAmountVisa) > + 15) { + Get.to( + () => const TransferBudgetPage()); + } else { + Get.snackbar( + "You don't have enough money in your SEFER wallet" + .tr, + ''); + } }) ], ),