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

25-5-30/1

Browse Source
This commit is contained in:
Hamza-Ayed
2025-05-30 16:58:17 +03:00
parent bdf380b925
commit cf8966ea29
41 changed files with 538 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,10 +263,7 @@ class PaymentController extends GetxController {
merchantDisplayName: AppInformation.appName,
billingDetails: BillingDetails(
name: box.read(BoxName.nameDriver) == null
? EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[0])
.toString()
? (box.read(BoxName.name).toString().split(' ')[0]).toString()
: box.read(BoxName.nameDriver).toString(),
email: box.read(BoxName.emailDriver) == null
? box.read(BoxName.email).toString()
@@ -561,16 +558,11 @@ class PaymentController extends GetxController {
"amount": newAmount,
"email":
box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
"first_name": EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[0])
"first_name": (box.read(BoxName.name).toString().split(' ')[0])
.toString(),
"last_name": EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[1])
"last_name": (box.read(BoxName.name).toString().split(' ')[1])
.toString(),
"phone_number": EncryptionHelper.instance
.decryptData(box.read(BoxName.phone)),
"phone_number": (box.read(BoxName.phone)),
});
// var d = jsonDecode(res);
Navigator.push(
@@ -611,13 +603,9 @@ class PaymentController extends GetxController {
payload: {
"amount": newAmount,
"email": box.read(BoxName.email),
"first_name": EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[0])
"first_name": (box.read(BoxName.name).toString().split(' ')[0])
.toString(),
"last_name": EncryptionHelper.instance
.decryptData(
box.read(BoxName.name).toString().split(' ')[1])
"last_name": (box.read(BoxName.name).toString().split(' ')[1])
.toString(),
"phone_number": (box.read(BoxName.phoneWallet)),
});

15
lib/controller/payment/paymob.dart
View File

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

15
lib/controller/payment/paymob/paymob_response.dart
View File

@@ -232,14 +232,10 @@ class PaymobBillingData {
Map<String, dynamic> toJson() {
return {
"email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
"first_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[0])
.toString(),
"last_name": EncryptionHelper.instance
.decryptData(box.read(BoxName.name).toString().split(' ')[1])
.toString(),
"phone_number":
EncryptionHelper.instance.decryptData(box.read(BoxName.phone)),
"first_name":
(box.read(BoxName.name).toString().split(' ')[0]).toString(),
"last_name": (box.read(BoxName.name).toString().split(' ')[1]).toString(),
"phone_number": (box.read(BoxName.phone)),
"apartment": apartment ?? "NA",
"floor": floor ?? "NA",
"building": building ?? "NA",
@@ -373,8 +369,7 @@ class _PaymentScreenState extends State<PaymentScreen> {
// ✅ استدعاء الويب هوك بعد انتهاء الدفع
Future<void> _fetchPaymentStatus() async {
final String userId = EncryptionHelper.instance
.decryptData(box.read(BoxName.phoneWallet)); // ضع user_id الحقيقي
final String userId = (box.read(BoxName.phoneWallet)); // ضع user_id الحقيقي
final String apiUrl = AppLink.paymetVerifyPassenger;
try {

14
lib/controller/payment/paymob/paymob_wallet.dart
View File

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