This commit is contained in:
Hamza-Ayed
2024-06-20 00:08:36 +03:00
parent fcce6b9be5
commit 1cc0156cfd
6 changed files with 36 additions and 22 deletions

View File

@@ -27,9 +27,9 @@ class CRUD {
'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials.toString()))}', 'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials.toString()))}',
}, },
); );
// print("-----request----" + response.request.toString()); print("-----request----" + response.request.toString());
// print("-----headers-----" + response.headers.toString()); // print("-----headers-----" + response.headers.toString());
// print("-----payload-----" + payload.toString()); print("-----payload-----" + payload.toString());
// if (response.statusCode == 200) { // if (response.statusCode == 200) {
// print(response.body); // print(response.body);
var jsonData = jsonDecode(response.body); var jsonData = jsonDecode(response.body);

View File

@@ -44,7 +44,7 @@ class CaptainWalletController extends GetxController {
Future refreshCaptainWallet() async { Future refreshCaptainWallet() async {
await getCaptainWalletFromRide(); await getCaptainWalletFromRide();
await getCaptainWalletFromBuyPoints(); await getCaptainWalletFromBuyPoints();
await checkAccountCaptainBank(); // await checkAccountCaptainBank();
} }
List amountToNewDriverMap = []; List amountToNewDriverMap = [];
@@ -95,6 +95,7 @@ class CaptainWalletController extends GetxController {
payload: {'driverID': box.read(BoxName.driverID)}, payload: {'driverID': box.read(BoxName.driverID)},
); );
isLoading = false; isLoading = false;
if (res != 'failure') {
walletDate = jsonDecode(res); walletDate = jsonDecode(res);
totalAmount = walletDate['message'][0]['total_amount'] ?? '0'; totalAmount = walletDate['message'][0]['total_amount'] ?? '0';
print(totalAmount); print(totalAmount);
@@ -108,6 +109,7 @@ class CaptainWalletController extends GetxController {
update(); update();
} }
}
Future getCaptainWalletFromBuyPoints() async { Future getCaptainWalletFromBuyPoints() async {
isLoading = true; isLoading = true;
@@ -168,8 +170,8 @@ class CaptainWalletController extends GetxController {
}); });
} }
Future addSeferWallet(String paymentMethod, point) async { Future addSeferWallet(String paymentMethod, String point) async {
var seferToken = await generateToken(point); var seferToken = await generateToken(point.toString());
await CRUD().post(link: AppLink.addSeferWallet, payload: { await CRUD().post(link: AppLink.addSeferWallet, payload: {
'amount': point.toString(), 'amount': point.toString(),
'paymentMethod': paymentMethod, 'paymentMethod': paymentMethod,
@@ -251,7 +253,7 @@ class CaptainWalletController extends GetxController {
void onInit() { void onInit() {
getCaptainWalletFromRide(); getCaptainWalletFromRide();
getCaptainWalletFromBuyPoints(); getCaptainWalletFromBuyPoints();
checkAccountCaptainBank(); // checkAccountCaptainBank();
super.onInit(); super.onInit();
} }
} }

View File

@@ -4,6 +4,8 @@ class MyTranslation extends Translations {
@override @override
Map<String, Map<String, String>> get keys => { Map<String, Map<String, String>> get keys => {
"ar": { "ar": {
"You don't have enough money in your SEFER wallet":
"لا يوجد رصيد كافٍ في محفظة SEFER الخاصة بك ",
"You have transferred to your wallet from": "لقد حولت إلى محفظتك من", "You have transferred to your wallet from": "لقد حولت إلى محفظتك من",
'Transfer': "تحويل", 'Transfer': "تحويل",
"amount": "المبلغ", "amount": "المبلغ",

View File

@@ -149,7 +149,7 @@ class CardSeferWalletDriver extends StatelessWidget {
}, },
child: Container( child: Container(
width: Get.width * .85, width: Get.width * .85,
height: Get.height * .25, height: Get.height * .27,
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppColor.deepPurpleAccent, color: AppColor.deepPurpleAccent,
borderRadius: const BorderRadius.all(Radius.circular(12)), borderRadius: const BorderRadius.all(Radius.circular(12)),

View File

@@ -39,7 +39,7 @@ class PointsCaptain extends StatelessWidget {
style: AppStyle.title, style: AppStyle.title,
), ),
MyElevatedButton( MyElevatedButton(
title: '💳 Pay with Credit Card'.tr, title: 'Pay with Credit Card'.tr,
onPressed: () async { onPressed: () async {
Get.back(); Get.back();
await paymentController.payWithPayMob( await paymentController.payWithPayMob(
@@ -53,7 +53,7 @@ class PointsCaptain extends StatelessWidget {
await captainWalletController.addDriverWallet( await captainWalletController.addDriverWallet(
'visa-in', countPoint); 'visa-in', countPoint);
await captainWalletController.addSeferWallet( await captainWalletController.addSeferWallet(
'visa-in', pricePoint); 'visa-in', pricePoint.toString());
await captainWalletController await captainWalletController
.getCaptainWalletFromBuyPoints(); .getCaptainWalletFromBuyPoints();
}); });
@@ -62,7 +62,7 @@ class PointsCaptain extends StatelessWidget {
// Add some spacing between buttons // Add some spacing between buttons
MyElevatedButton( MyElevatedButton(
kolor: AppColor.redColor, kolor: AppColor.redColor,
title: '💰 Pay with Wallet'.tr, title: 'Pay with Wallet'.tr,
onPressed: () async { onPressed: () async {
Get.back(); Get.back();
await paymentController.payWithPayMobWallet( await paymentController.payWithPayMobWallet(
@@ -76,7 +76,7 @@ class PointsCaptain extends StatelessWidget {
await captainWalletController.addDriverWallet( await captainWalletController.addDriverWallet(
'visa-in', countPoint); 'visa-in', countPoint);
await captainWalletController.addSeferWallet( await captainWalletController.addSeferWallet(
'visa-in', pricePoint); 'visa-in', pricePoint.toString());
await captainWalletController await captainWalletController
.getCaptainWalletFromBuyPoints(); .getCaptainWalletFromBuyPoints();
}); });

View File

@@ -258,7 +258,17 @@ class WalletCaptain extends StatelessWidget {
MyElevatedButton( MyElevatedButton(
title: 'Transfer budget'.tr, title: 'Transfer budget'.tr,
onPressed: () { 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,
'');
}
}) })
], ],
), ),