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

Fixes & Updates - 2026-06-01: Integrate Back-End v3 updates, fix call/connection issues across apps

Browse Source
This commit is contained in:
Hamza-Ayed
2026-06-01 23:36:27 +03:00
parent 118781fd66
commit 97945aa362
76 changed files with 19806 additions and 10822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,9 @@ import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart';
import 'package:local_auth/local_auth.dart';
import 'package:Intaleq/controller/home/map_passenger_controller.dart';
import 'package:Intaleq/controller/home/map/ride_lifecycle_controller.dart';
import 'package:Intaleq/controller/home/map/ride_state.dart';
import 'package:Intaleq/controller/home/map/ride_state.dart';
import 'package:webview_flutter/webview_flutter.dart';
import '../../constant/box_name.dart';
@@ -34,7 +36,7 @@ class PaymentController extends GetxController {
final formKey = GlobalKey<FormState>();
final promo = TextEditingController();
final walletphoneController = TextEditingController();
double totalPassenger = Get.find<MapPassengerController>().totalPassenger;
double totalPassenger = Get.find<RideLifecycleController>().totalPassenger;
int? selectedAmount = 0;
List<dynamic> totalPassengerWalletDetails = [];
String passengerTotalWalletAmount = '';
@@ -79,7 +81,7 @@ class PaymentController extends GetxController {
Future<String> generateTokenDriver(String amount) async {
var res = await CRUD().post(link: AppLink.addPaymentTokenDriver, payload: {
'driverID': Get.find<MapPassengerController>().driverId,
'driverID': Get.find<RideLifecycleController>().driverId,
'amount': amount.toString(),
});
var d = jsonDecode(res);
@@ -121,7 +123,7 @@ class PaymentController extends GetxController {
'payment_method': 'cancel-from-near',
'passengerID': box.read(BoxName.passengerID).toString(),
'token': paymentTokenWait,
'driverID': Get.find<MapPassengerController>().driverId.toString(),
'driverID': Get.find<RideLifecycleController>().driverId.toString(),
});
var paymentTokenWait1 =
await generateTokenDriver(costOfWaiting5Minute.toString());
@@ -131,7 +133,7 @@ class PaymentController extends GetxController {
'amount': (costOfWaiting5Minute).toStringAsFixed(0),
'paymentMethod': 'cancel-from-near',
'token': paymentTokenWait1,
'driverID': Get.find<MapPassengerController>().driverId.toString(),
'driverID': Get.find<RideLifecycleController>().driverId.toString(),
});
if (res != 'failure') {
@@ -139,13 +141,13 @@ class PaymentController extends GetxController {
// 'Cancel',
// 'Trip Cancelled. The cost of the trip will be added to your wallet.'
// .tr,
// Get.find<MapPassengerController>().driverToken,
// Get.find<RideLifecycleController>().driverToken,
// [],
// 'cancel',
// );
await NotificationService.sendNotification(
category: 'Cancel',
target: Get.find<MapPassengerController>().driverToken.toString(),
target: Get.find<RideLifecycleController>().driverToken.toString(),
title: 'Cancel'.tr,
body:
'Trip Cancelled. The cost of the trip will be added to your wallet.'
@@ -226,7 +228,7 @@ class PaymentController extends GetxController {
var firstElement = decod["message"][0];
totalPassenger = totalPassenger -
(totalPassenger * int.parse(firstElement['amount']));
MapPassengerController().promoTaken = true;
Get.find<RideLifecycleController>().promoTaken = true;
update();
}
});