7/10/1

lib/controller/auth/captin/login_captin_controller.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:math';
 
 import 'package:SEFER/constant/colors.dart';
 import 'package:SEFER/controller/functions/location_background_controller.dart';
@@ -11,9 +10,7 @@ import 'package:get/get.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/constant/links.dart';
 import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/secure_storage.dart';
 import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/captin/verify_email_captain.dart';
 import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
 import 'package:location/location.dart';
 

lib/controller/auth/captin/register_captin_controller.dart

@@ -106,6 +106,7 @@ class RegisterCaptainController extends GetxController {
             await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
               'phone_number': '+2${phoneController.text}',
               'token_code': randomNumber.toString(),
+              "driverId": box.read(BoxName.driverID)
             });
 
             await smsEgyptController.sendSmsEgypt(
@@ -119,6 +120,7 @@ class RegisterCaptainController extends GetxController {
           await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
             'phone_number': '+2${phoneController.text}',
             'token_code': randomNumber.toString(),
+            "driverId": box.read(BoxName.driverID)
           });
 
           await smsEgyptController.sendSmsEgypt(

lib/controller/functions/crud.dart

@@ -217,6 +217,9 @@ class CRUD {
             'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials))}',
       },
     );
+    print(response.request);
+    print(response.body);
+    print(payload);
     var jsonData = jsonDecode(response.body);
     if (response.statusCode == 200) {
       if (jsonData['status'] == 'success') {

lib/controller/functions/sms_egypt_controller.dart

@@ -13,7 +13,6 @@ class SmsEgyptController extends GetxController {
   var headers = {'Content-Type': 'application/json'};
 
   Future<dynamic> sendSmsEgypt(String phone, otp) async {
-    print('password ==== ${AK.smsPasswordEgypt}');
     var body = jsonEncode({
       "username": AppInformation.appName,
       "password": AK.smsPasswordEgypt, //'E)Pu=an/@Z',

lib/controller/home/captin/home_captain_controller.dart

@@ -313,7 +313,12 @@ class HomeCaptainController extends GetxController {
         payload: {'driverID': box.read(BoxName.driverID).toString()});
     data = jsonDecode(res);
 
-    totalMoneyInSEFER = data['message'][0]['total_amount'];
+    totalMoneyInSEFER = data['message'][0]['total_amount'] ?? '0';
+    update();
+  }
+
+  void changeToAppliedRide(String status) {
+    box.write(BoxName.rideStatus, status);
     update();
   }
 

lib/controller/home/captin/map_driver_controller.dart

@@ -222,6 +222,8 @@ class MapDriverController extends GetxController {
       'driverGoToPassengerTime': DateTime.now().toString(),
       'status': 'Applied'
     });
+
+    // Get.find<HomeCaptainController>().changeToAppliedRide('Applied');
     box.write(BoxName.rideStatus, 'Applied');
     FirebaseMessagesController().sendNotificationToAnyWithoutData(
         'DriverIsGoingToPassenger',
@@ -284,8 +286,11 @@ class MapDriverController extends GetxController {
       remainingTimeInPassengerLocatioWait = 0;
       timeWaitingPassenger = 0;
       box.write(BoxName.statusDriverLocation, 'on');
-      box.write(BoxName.rideStatus, 'Begin'); //todo ride details
-
+      // box.write(BoxName.rideStatus, 'Begin'); //
+      // todo ride details
+      // Get.find<HomeCaptainController>().changeToAppliedRide('Begin');
+      box.write(BoxName.rideStatus, 'Begin');
+      // Get.find<HomeCaptainController>().update();
       update();
       await CRUD().post(link: AppLink.updateRides, payload: {
         'id': rideId,
@@ -490,6 +495,8 @@ class MapDriverController extends GetxController {
     isRideStarted = false;
     isPriceWindow = false;
     box.write(BoxName.rideStatus, 'Finished');
+    // Get.find<HomeCaptainController>().changeToAppliedRide('Finished');
+    // Get.find<HomeCaptainController>().update();
     totalCost = price < 30
         ? carType != 'Comfort' && carType != 'Mashwari' && carType != 'Lady'
             ? '20'

lib/controller/local/translations.dart

@@ -256,12 +256,13 @@ class MyTranslation extends Translations {
               "التقاط صورة للجهة الخلفية من وثيقة الهوية الخاصة بك",
           "ID Documents Front": "الوجه الأمامي لوثائق الهوية",
           "First Name": "الاسم الأول",
+          "Press to hear": "اضغط للاستماع",
           "CardID": "التقاط صورة للجهة الخلفية من وثيقة الهوية الخاصة بك",
           "Full Name": "الاسم الكامل",
           "Vehicle Details Front": "تفاصيل المركبة الأمامية",
           "Plate Number": "رقم اللوحة",
           "Owner Name": "اسم المالك",
-          "Vehicle Details Back": "تفاصيل السيارة مرة أخرى",
+          "Vehicle Details Back": "تفاصيل المركبة الخلفية",
           "Make": "‏نوع السيارة",
           "Model": "طراز السيارة:",
           "Year": "السنة",
@@ -548,7 +549,7 @@ class MyTranslation extends Translations {
           "Current Location": "الموقع الحالي",
           "Add Location 1": "أضف الموقع 1",
           "You must Verify email !.": "يجب التحقق من البريد الإلكتروني!",
-          "Cropper": "المحصاد",
+          "Cropper": "القص",
           "Saved Sucssefully": "تم الحفظ بنجاح",
           "Select Date": "اختر التاريخ",
           "Birth Date": "تاريخ الميلاد",