25-2/24/1

This commit is contained in:
Hamza-Ayed
2025-02-24 23:38:42 +03:00
parent 218e174c87
commit 3162b1bec6
56 changed files with 1318 additions and 527 deletions

View File

@@ -14,7 +14,7 @@ class DriverWalletHistoryController extends GetxController {
getArchivePayment() async {
isLoading = true;
update();
var res = await CRUD().get(
var res = await CRUD().getWallet(
link: AppLink.getWalletByDriver,
payload: {'driverID': box.read(BoxName.driverID)});
if (res == 'failure') {

View File

@@ -17,7 +17,7 @@ class PassengerWalletHistoryController extends GetxController {
isLoading = true;
update();
var res = await CRUD().get(
var res = await CRUD().getWallet(
link: AppLink.getPassengerWalletArchive,
payload: {'passenger_id': box.read(BoxName.passengerID)},
);

View File

@@ -56,7 +56,7 @@ class PaymentController extends GetxController {
isLoading = true;
update();
await CRUD().get(
await CRUD().getWallet(
link: AppLink.getWalletByPassenger,
payload: {'passenger_id': box.read(BoxName.passengerID)}).then((value) {
box.write(BoxName.passengerWalletTotal,
@@ -134,7 +134,7 @@ class PaymentController extends GetxController {
});
if (res != 'failure') {
FirebaseMessagesController().sendNotificationToDriverMAP(
Get.find<FirebaseMessagesController>().sendNotificationToDriverMAP(
'Cancel',
'Trip Cancelled. The cost of the trip will be added to your wallet.'
.tr,
@@ -265,7 +265,7 @@ class PaymentController extends GetxController {
merchantDisplayName: AppInformation.appName,
billingDetails: BillingDetails(
name: box.read(BoxName.nameDriver) == null
? encryptionHelper
? EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[0])
.toString()

View File

@@ -135,14 +135,15 @@ class PaymobManager extends GetxController {
"amount_cents": amount,
"currency": currency,
"billing_data": {
"first_name": encryptionHelper
"first_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[0])
.toString(),
"last_name": encryptionHelper
"last_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[1])
.toString(),
"email": encryptionHelper.decryptData(box.read(BoxName.email)),
"phone_number": encryptionHelper.decryptData(box.read(BoxName.phone)),
"email": EncryptionHelper.instance.decryptData(box.read(BoxName.email)),
"phone_number":
EncryptionHelper.instance.decryptData(box.read(BoxName.phone)),
"apartment": "NA",
"floor": "NA",
"street": "NA",

View File

@@ -226,13 +226,14 @@ class PaymobBillingData {
Map<String, dynamic> toJson() {
return {
"email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
"first_name": encryptionHelper
"first_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[0])
.toString(),
"last_name": encryptionHelper
"last_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[1])
.toString(),
"phone_number": encryptionHelper.decryptData(box.read(BoxName.phone)),
"phone_number":
EncryptionHelper.instance.decryptData(box.read(BoxName.phone)),
"apartment": apartment ?? "NA",
"floor": floor ?? "NA",
"building": building ?? "NA",

View File

@@ -267,11 +267,11 @@ class PaymobBillingDataWallet {
Map<String, dynamic> toJson() {
return {
"email": encryptionHelper.decryptData(box.read(BoxName.email)),
"first_name": encryptionHelper
"email": EncryptionHelper.instance.decryptData(box.read(BoxName.email)),
"first_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[0])
.toString(),
"last_name": encryptionHelper
"last_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[1])
.toString() ??
'tripz',