25-2/7/1

2025-02-07 23:55:33 +03:00
parent 3162ae823e
commit 5f53461b34
18 changed files with 965 additions and 933 deletions
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -39,7 +39,43 @@ class CRUD {

    return jsonData['status'];
  }
+
  // }
+  Future<dynamic> post({
+    required String link,
+    Map<String, dynamic>? payload,
+  }) async {
+    // String? basicAuthCredentials =
+    //     await storage.read(key: BoxName.basicAuthCredentials);
+    var url = Uri.parse(
+      link,
+    );
+    var response = await http.post(
+      url,
+      body: payload,
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        'Authorization':
+            'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
+      },
+    );
+    Log.print('request: ${response.request}');
+    Log.print('response: ${response.body}');
+    Log.print('payload: ${payload}');
+    var jsonData = jsonDecode(response.body);
+    if (response.statusCode == 200) {
+      if (jsonData['status'] == 'success') {
+        return response.body;
+      } else {
+        // String errorMessage = jsonData['message'];
+        // Get.snackbar('Error'.tr, errorMessage.tr,
+        //     backgroundColor: AppColor.redColor);
+        return (jsonData['status']);
+      }
+    } else {
+      return response.statusCode;
+    }
+  }

  Future<dynamic> getAgoraToken({
    required String channelName,
@@ -206,42 +242,6 @@ class CRUD {
    } else {}
  }

-  Future<dynamic> post({
-    required String link,
-    Map<String, dynamic>? payload,
-  }) async {
-    // String? basicAuthCredentials =
-    //     await storage.read(key: BoxName.basicAuthCredentials);
-    var url = Uri.parse(
-      link,
-    );
-    var response = await http.post(
-      url,
-      body: payload,
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded",
-        'Authorization':
-            'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
-      },
-    );
-    Log.print('request: ${response.request}');
-    Log.print('response: ${response.body}');
-    Log.print('payload: ${payload}');
-    var jsonData = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      if (jsonData['status'] == 'success') {
-        return response.body;
-      } else {
-        // String errorMessage = jsonData['message'];
-        // Get.snackbar('Error'.tr, errorMessage.tr,
-        //     backgroundColor: AppColor.redColor);
-        return (jsonData['status']);
-      }
-    } else {
-      return response.statusCode;
-    }
-  }
-
  Future<dynamic> postPayMob({
    required String link,
    Map<String, dynamic>? payload,
--- a/lib/controller/functions/secure_storage.dart
+++ b/lib/controller/functions/secure_storage.dart
@@ -52,7 +52,6 @@ class AppInitializer {
    try {
      var res =
          await CRUD().get(link: AppLink.getLocationAreaLinks, payload: {});
-      Log.print('res: ${res}');
      if (res != 'failure') {
        links = List<Map<String, dynamic>>.from(jsonDecode(res)['message']);
        await box.remove(BoxName.locationName);
@@ -70,8 +69,6 @@ class AppInitializer {
        await box.write(BoxName.paymentLink,
            encryptionHelper.decryptData(links[4]['server_link']));
      }
-    } catch (e) {
-      print('Error fetching or decoding location data: $e');
-    }
+    } catch (e) {}
  }
 }
--- a/lib/controller/local/local_controller.dart
+++ b/lib/controller/local/local_controller.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:sefer_driver/constant/box_name.dart';
-import 'package:sefer_driver/main.dart';
-import 'package:sefer_driver/controller/themes/themes.dart';
+
+import '../../constant/box_name.dart';
+import '../../main.dart';
+import '../themes/themes.dart';

 class LocaleController extends GetxController {
  Locale? language;
@@ -73,6 +74,16 @@ class LocaleController extends GetxController {
        appTheme = lightThemeEnglish;
        box.write(BoxName.lang, 'hi');
        break;
+      case "ar-ma":
+        locale = const Locale("ar-ma");
+        appTheme = lightThemeArabic;
+        box.write(BoxName.lang, 'ar-ma');
+        break;
+      case "ar-gulf":
+        locale = const Locale("ar-gulf");
+        appTheme = lightThemeArabic;
+        box.write(BoxName.lang, 'ar-gulf');
+        break;
      default:
        locale = Locale(Get.deviceLocale!.languageCode);
        box.write(BoxName.lang, Get.deviceLocale!.languageCode);
--- a/lib/controller/local/translations.dart
+++ b/lib/controller/local/translations.dart
--- a/lib/controller/payment/payment_controller.dart
+++ b/lib/controller/payment/payment_controller.dart
@@ -19,6 +19,7 @@ import '../../constant/links.dart';
 import '../../main.dart';
 import '../../print.dart';
 import '../functions/crud.dart';
+import '../functions/encrypt_decrypt.dart';
 import '../functions/toast.dart';
 import 'paymob/paymob_wallet.dart';

@@ -155,15 +156,9 @@ class PaymentController extends GetxController {
        paymentIntentClientSecret: clientSecret,
        merchantDisplayName: AppInformation.appName,
        billingDetails: BillingDetails(
-            name: box.read(BoxName.nameDriver) == null
-                ? box.read(BoxName.name).toString()
-                : box.read(BoxName.nameDriver).toString(),
-            email: box.read(BoxName.emailDriver) == null
-                ? box.read(BoxName.email).toString()
-                : box.read(BoxName.emailDriver).toString(),
-            phone: box.read(BoxName.phoneDriver) == null
-                ? box.read(BoxName.phone).toString()
-                : box.read(BoxName.phoneDriver).toString(),
+            name: encryptionHelper.decryptData(box.read(BoxName.nameDriver)),
+            email: encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
+            phone: encryptionHelper.decryptData(box.read(BoxName.phoneDriver)),
            address: Address(
                city: 'city',
                country: box.read(BoxName.countryCode), //'United States'
--- a/lib/controller/payment/paymob.dart
+++ b/lib/controller/payment/paymob.dart
@@ -7,6 +7,7 @@ import 'package:url_launcher/url_launcher.dart';

 import '../../constant/api_key.dart';
 import '../../main.dart';
+import '../functions/encrypt_decrypt.dart';

 class PaymobManager extends GetxController {
  String authanticationToken1 = "";
@@ -132,11 +133,13 @@ class PaymobManager extends GetxController {
      "amount_cents": amount,
      "currency": currency,
      "billing_data": {
-        "first_name": box.read(BoxName.nameDriver) ?? box.read(BoxName.name),
-        "last_name": box.read(BoxName.lastNameDriver) ?? box.read(BoxName.name),
-        "email": box.read(BoxName.emailDriver) ?? box.read(BoxName.email),
+        "first_name":
+            encryptionHelper.decryptData(box.read(BoxName.nameDriver)),
+        "last_name":
+            encryptionHelper.decryptData(box.read(BoxName.lastNameDriver)),
+        "email": encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
        "phone_number":
-            box.read(BoxName.phoneDriver) ?? box.read(BoxName.phone),
+            encryptionHelper.decryptData(box.read(BoxName.phoneDriver)),
        "apartment": "NA",
        "floor": "NA",
        "street": "NA",
--- a/lib/controller/payment/paymob/paymob_response.dart
+++ b/lib/controller/payment/paymob/paymob_response.dart
@@ -1,4 +1,5 @@
 import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/functions/encrypt_decrypt.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
@@ -223,10 +224,11 @@ class PaymobBillingData {

  Map<String, dynamic> toJson() {
    return {
-      "email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
-      "first_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
-      "last_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
-      "phone_number": box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver),
+      "email": encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
+      "first_name": box.read(BoxName.nameDriver),
+      "last_name": box.read(BoxName.nameDriver),
+      "phone_number":
+          encryptionHelper.decryptData(box.read(BoxName.phoneDriver)),
      "apartment": apartment ?? "NA",
      "floor": floor ?? "NA",
      "building": building ?? "NA",
--- a/lib/controller/payment/paymob/paymob_wallet.dart
+++ b/lib/controller/payment/paymob/paymob_wallet.dart
@@ -1,4 +1,5 @@
 import 'package:sefer_driver/constant/box_name.dart';
+import 'package:sefer_driver/controller/functions/encrypt_decrypt.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
@@ -266,10 +267,10 @@ class PaymobBillingDataWallet {

  Map<String, dynamic> toJson() {
    return {
-      "email": box.read(BoxName.email) ?? box.read(BoxName.emailDriver),
+      "email": encryptionHelper.decryptData(box.read(BoxName.emailDriver)),
      "first_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
      "last_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
-      "phone_number": box.read(BoxName.phone) ?? box.read(BoxName.phoneDriver),
+      "phone_number": (box.read(BoxName.phoneWallet)),
      "apartment": apartment ?? "NA",
      "floor": floor ?? "NA",
      "building": building ?? "NA",