5/29/5

lib/controller/auth/captin/register_captin_controller.dart

@@ -91,8 +91,8 @@ class RegisterCaptainController extends GetxController {
           'token_code': randomNumber.toString(),
         });
 
-        // await smsEgyptController.sendSmsEgypt(
-        //     phoneController.text.toString(), randomNumber.toString());
+        await smsEgyptController.sendSmsEgypt(
+            phoneController.text.toString(), randomNumber.toString());
         isSent = true;
         isLoading = false;
         update();

lib/controller/functions/sms_egypt_controller.dart

@@ -15,10 +15,10 @@ class SmsEgyptController extends GetxController {
   Future<dynamic> sendSmsEgypt(String phone, otp) async {
     var body = jsonEncode({
       "username": AppInformation.appName,
-      "password": 'E)Pu=an/@Z', // AK.smsPasswordEgypt,
+      "password": AK.smsPasswordEgypt, //'E)Pu=an/@Z',
       "message": "${AppInformation.appName} app code is $otp\ncopy it to app",
       "language": box.read(BoxName.lang) == 'en' ? "e" : 'r',
-      "sender": "Kazumi", // todo add sefer sender name
+      "sender": "Sefer", // todo add sefer sender name
       "receiver": "2$phone"
     });
 
@@ -64,7 +64,7 @@ class SmsEgyptController extends GetxController {
         "password": AK.smsPasswordEgypt,
         "message": "This is an example SMS message.",
         "language": box.read(BoxName.lang) == 'en' ? "e" : 'r',
-        "sender": "Kazumi", // todo add sefer sender name
+        "sender": "Sefer", //"Kazumi", // todo add sefer sender name
         "receiver": "2$phone",
         "validity": "10",
         "StartTime": DateTime.now().toString() // "1/1/2024 10:00:00"

lib/controller/home/captin/map_driver_controller.dart

@@ -387,9 +387,10 @@ class MapDriverController extends GetxController {
                 Get.back();
               }));
     } else {
-      double costOfWaiting5Minute =
-          (distanceBetweenDriverAndPassengerWhenConfirm * .08) +
-              (5 * 1); //for Eygpt other like jordan .06 per minute
+      double costOfWaiting5Minute = box.read(BoxName.countryCode) == 'Egypt'
+          ? (distanceBetweenDriverAndPassengerWhenConfirm * .08) + (5 * 1)
+          : (distanceBetweenDriverAndPassengerWhenConfirm * .06) +
+              (5 * .06); //for Eygpt other like jordan .06 per minute
       var res = await CRUD().post(link: AppLink.addDriverpayment, payload: {
         'rideId': rideId,
         'amount': costOfWaiting5Minute.toString(),
@@ -516,6 +517,7 @@ class MapDriverController extends GetxController {
       'price': price.toString(),
     });
     // Get.back();
+    // }
   }
 
   void cancelCheckRideFromPassenger() async {

lib/controller/local/translations.dart

@@ -4,6 +4,13 @@ class MyTranslation extends Translations {
   @override
   Map<String, Map<String, String>> get keys => {
         "ar": {
+          "Total price from ": "إجمالي السعر من ",
+          "Wallet Add": "إضافة إلى المحفظة",
+          "Press here": "اضغط هنا",
+          "Would the passenger like to settle the remaining fare using their wallet?":
+              "هل يرغب الراكب بسداد باقي الأجرة باستخدام محفظته؟",
+          "How much Passenger pay?": "كم يدفع الراكب؟",
+          "passenger amount to me": "مبلغ الراكب لي",
           "Please wait": "الرجاء الانتظار",
           "minutes before trying again.": " دقيقة قبل المحاولة مرة أخرى.",
           "Total rides on month": "إجمالي الرحلات في الشهر",

lib/controller/rate/rate_conroller.dart

@@ -14,8 +14,10 @@ import 'package:SEFER/views/widgets/elevated_btn.dart';
 class RateController extends GetxController {
   double selectedRateItemId = -1;
   TextEditingController comment = TextEditingController();
+  TextEditingController passenggerPayAmount = TextEditingController();
   String? rideId, passengerId, driverId, price;
   late GlobalKey<FormState> formKey;
+  bool ispassengerWantWalletFromDriver = false;
   @override
   void onInit() {
     formKey = GlobalKey<FormState>();
@@ -27,6 +29,28 @@ class RateController extends GetxController {
     super.onInit();
   }
 
+  void passengerWantPay() {
+    ispassengerWantWalletFromDriver = true;
+    update();
+  }
+
+  Future addPassengerWallet() async {
+    if (formKey.currentState!.validate()) {
+      var priceOfTrip =
+          double.parse(Get.find<MapDriverController>().paymentAmount);
+      double remainingFee =
+          double.parse(passenggerPayAmount.text) - priceOfTrip;
+      await CRUD().post(link: AppLink.addPassengersWallet, payload: {
+        'passenger_id': passengerId,
+        'balance': remainingFee.toString()
+      }).then((value) {
+        if (value != 'failure') {
+          Get.snackbar('Wallet Add', '');
+        }
+      });
+    }
+  }
+
   void selectRateItem(double id) {
     selectedRateItemId = id;
     update();