From a09bfbd64672750d43a1fcd301d43b343c459666 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Tue, 4 Feb 2025 23:11:40 +0300
Subject: [PATCH] 25-2/4/1

---
 lib/controller/auth/google_sign.dart                 |  3 +++
 lib/controller/functions/crud.dart                   | 12 ++++++------
 lib/controller/payment/paymob/paymob_wallet.dart     |  5 +++--
 .../home/my_wallet/passenger_wallet_dialoge.dart     |  7 +++++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/controller/auth/google_sign.dart b/lib/controller/auth/google_sign.dart
index 8db0dd7..0c924a6 100644
--- a/lib/controller/auth/google_sign.dart
+++ b/lib/controller/auth/google_sign.dart
@@ -12,6 +12,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../constant/links.dart';
 import '../../onbording_page.dart';
+import '../../print.dart';
 import '../functions/crud.dart';
 
 class GoogleSignInHelper {
@@ -164,6 +165,8 @@ class GoogleSignInHelper {
   // Method to handle sign-up process
   static Future<void> _handleSignUp(GoogleSignInAccount user) async {
     // Store driver information
+
+    Log.print('email is ${user.email}');
     box.write(BoxName.passengerID, user.id);
     box.write(BoxName.email, encryptionHelper.encryptData(user.email));
     box.write(BoxName.name,
diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart
index fe8380d..9934754 100644
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -30,9 +30,9 @@ class CRUD {
             'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials.toString()))}',
       },
     );
-    // Log.print('req: ${response.request}');
-    // Log.print('response: ${response.body}');
-    // Log.print('payload: ${payload}');
+    Log.print('req: ${response.request}');
+    Log.print('response: ${response.body}');
+    Log.print('payload: ${payload}');
     // if (response.statusCode == 200) {
     var jsonData = jsonDecode(response.body);
     if (jsonData['status'] == 'success') {
@@ -60,9 +60,9 @@ class CRUD {
 
       if (response.statusCode == 200) {
         try {
-          // Log.print('req: ${response.request}');
-          // Log.print('response: ${response.body}');
-          // Log.print('payload: ${payload}');
+          Log.print('req: ${response.request}');
+          Log.print('response: ${response.body}');
+          Log.print('payload: ${payload}');
           var jsonData = jsonDecode(response.body);
 
           if (jsonData['status'] == 'success') {
diff --git a/lib/controller/payment/paymob/paymob_wallet.dart b/lib/controller/payment/paymob/paymob_wallet.dart
index 8f20019..7bb861d 100644
--- a/lib/controller/payment/paymob/paymob_wallet.dart
+++ b/lib/controller/payment/paymob/paymob_wallet.dart
@@ -145,7 +145,8 @@ class PaymobPaymentWallet {
   }) async {
     final Map<String, dynamic> data = {
       "source": {
-        "identifier": box.read(BoxName.phoneWallet).toString(),
+        "identifier": encryptionHelper
+            .decryptData(box.read(BoxName.phoneWallet).toString()),
         "subtype": "WALLET",
       },
       "payment_token": paymentToken,
@@ -267,7 +268,7 @@ class PaymobBillingDataWallet {
 
   Map<String, dynamic> toJson() {
     return {
-      "email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
+      "email": box.read(BoxName.email),
       "first_name": encryptionHelper
           .decryptData(box.read(BoxName.name).toString().split(' ')[0])
           .toString(),
diff --git a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart
index 45d570b..4edc4a1 100644
--- a/lib/views/home/my_wallet/passenger_wallet_dialoge.dart
+++ b/lib/views/home/my_wallet/passenger_wallet_dialoge.dart
@@ -1,4 +1,5 @@
 import 'package:Tripz/constant/style.dart';
+import 'package:Tripz/controller/functions/encrypt_decrypt.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -334,8 +335,10 @@ void showPaymentOptions(BuildContext context, PaymentController controller) {
                                   color: CupertinoColors.activeGreen)),
                           onPressed: () async {
                             Get.back();
-                            box.write(BoxName.phoneWallet,
-                                controller.walletphoneController.text);
+                            box.write(
+                                BoxName.phoneWallet,
+                                encryptionHelper.encryptData(
+                                    controller.walletphoneController.text));
                             Toast.show(
                                 context,
                                 'Phone Wallet Saved Successfully'.tr,