12/14/1

2023-12-14 23:09:46 +03:00
parent 2ff52420ce
commit c2fd1187d0
19 changed files with 523 additions and 195 deletions
--- a/lib/controller/auth/register_controller.dart
+++ b/lib/controller/auth/register_controller.dart
@@ -4,8 +4,10 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:ride/constant/links.dart';
+import 'package:ride/constant/style.dart';
 import 'package:ride/controller/functions/crud.dart';
 import 'package:ride/views/auth/login_page.dart';
+import 'package:ride/views/widgets/elevated_btn.dart';

 import '../../views/auth/verify_email_page.dart';

@@ -29,26 +31,27 @@ class RegisterController extends GetxController {

  getBirthDate() {
    Get.defaultDialog(
-      title: 'Select Date',
-      content: SizedBox(
-        width: 300,
-        child: CalendarDatePicker(
-          initialDate: DateTime.now().subtract(const Duration(days: 14 * 365)),
-          firstDate: DateTime.parse('1940-06-01'),
-          lastDate: DateTime.now().subtract(const Duration(days: 14 * 365)),
-          onDateChanged: (date) {
-            // Get the selected date and convert it to a DateTime object
-            DateTime dateTime = date;
-            // Call the getOrders() function from the controller
-            birthDate = dateTime.toString().split(' ')[0];
-            update();
-            Get.back();
-          },
+        title: 'Select Date',
+        titleStyle: AppStyle.title,
+        content: SizedBox(
+          width: 300,
+          child: CalendarDatePicker(
+            initialDate:
+                DateTime.now().subtract(const Duration(days: 14 * 365)),
+            firstDate: DateTime.parse('1940-06-01'),
+            lastDate: DateTime.now().subtract(const Duration(days: 14 * 365)),
+            onDateChanged: (date) {
+              // Get the selected date and convert it to a DateTime object
+              DateTime dateTime = date;
+              // Call the getOrders() function from the controller
+              birthDate = dateTime.toString().split(' ')[0];
+              update();
+            },

-          // onDateChanged: (DateTime value) {},
+            // onDateChanged: (DateTime value) {},
+          ),
        ),
-      ),
-    );
+        confirm: MyElevatedButton(title: 'Ok'.tr, onPressed: () => Get.back()));
  }

  void changeGender(String value) {
@@ -75,7 +78,7 @@ class RegisterController extends GetxController {
        'email': emailController.text.toString(),
        'phone': phoneController.text.toString(),
        'password': passwordController.text.toString(),
-        'gender': gender,
+        'gender': 'yet',
        'site': siteController.text,
        'birthdate': birthDate,
      });
--- a/lib/controller/functions/log_out.dart
+++ b/lib/controller/functions/log_out.dart
@@ -1,24 +1,81 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
-import 'package:flutter/src/widgets/basic.dart';
 import 'package:get/get.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/constant/colors.dart';
 import 'package:ride/constant/links.dart';
 import 'package:ride/controller/functions/crud.dart';
 import 'package:ride/main.dart';
+import 'package:ride/onbording_page.dart';
 import 'package:ride/views/lang/languages.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';
+import 'package:ride/views/widgets/my_textField.dart';

 import '../../constant/style.dart';

 class LogOut {
+  TextEditingController checkTxtController = TextEditingController();
+  final formKey = GlobalKey<FormState>();
  Future deleteMyAccount(String id) async {
    await CRUD().post(link: AppLink.removeUser, payload: {'id': id}).then(
        (value) => Get.snackbar('Deleted', 'Your Account is Deleted',
            backgroundColor: AppColor.redColor));
  }

-  Future logOut() async {
+  checkBeforeDelete() async {
+    var res = await CRUD().post(
+        link: AppLink.deletecaptainAccounr,
+        payload: {'id': box.read(BoxName.driverID)}).then((value) => exit(0));
+  }
+
+  deletecaptainAccount() {
+    Get.defaultDialog(
+        backgroundColor: AppColor.yellowColor,
+        title: 'Are you sure to delete your account?'.tr,
+        middleText:
+            'Your data will be erased after 2 weeks\nAnd you will can\'t return to use app after 1 month ',
+        titleStyle: AppStyle.title,
+        content: Column(
+          children: [
+            Container(
+              width: Get.width,
+              decoration: AppStyle.boxDecoration,
+              child: Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Text(
+                  'Your data will be erased after 2 weeks\nAnd you will can\'t return to use app after 1 month'
+                      .tr,
+                  style: AppStyle.title.copyWith(color: AppColor.redColor),
+                ),
+              ),
+            ),
+            const SizedBox(
+              height: 20,
+            ),
+            Form(
+                key: formKey,
+                child: SizedBox(
+                  width: Get.width,
+                  child: MyTextForm(
+                    controller: checkTxtController,
+                    label: 'Enter Your First Name'.tr,
+                    hint: 'Enter Your First Name'.tr,
+                    type: TextInputType.name,
+                  ),
+                ))
+          ],
+        ),
+        confirm: MyElevatedButton(
+            title: 'Delete'.tr,
+            onPressed: () {
+              if (checkTxtController.text == box.read(BoxName.nameDriver)) {
+                deletecaptainAccount();
+              }
+            }));
+  }
+
+  Future logOutPassenger() async {
    Get.defaultDialog(
        title: 'Are you Sure to LogOut?'.tr,
        content: Row(
@@ -42,7 +99,54 @@ class LogOut {
                  box.remove(BoxName.phone);
                  box.remove(BoxName.tokenFCM);
                  box.remove(BoxName.tokens);
-                  Get.offAll(const Language());
+                  Get.offAll(OnBoardingPage());
+                },
+                child: Text(
+                  'Sign Out'.tr,
+                  style:
+                      AppStyle.title.copyWith(color: AppColor.secondaryColor),
+                ))
+          ],
+        ));
+  }
+
+  Future logOutCaptain() async {
+    Get.defaultDialog(
+        title: 'Are you Sure to LogOut?'.tr,
+        titleStyle: AppStyle.title,
+        content: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceAround,
+          children: [
+            MyElevatedButton(
+              title: 'Cancel'.tr,
+              onPressed: () => Get.back(),
+            ),
+            ElevatedButton(
+                style: ButtonStyle(
+                  backgroundColor: MaterialStateProperty.all(AppColor.redColor),
+                ),
+                onPressed: () {
+                  // box.remove(BoxName.agreeTerms);
+                  box.remove(BoxName.driverID);
+                  box.remove(BoxName.sexDriver);
+                  box.remove(BoxName.dobDriver);
+                  box.remove(BoxName.nameDriver);
+                  box.remove(BoxName.emailDriver);
+                  box.remove(BoxName.phoneDriver);
+                  box.remove(BoxName.statusDriverLocation);
+                  box.remove(BoxName.cvvCodeDriver);
+                  box.remove(BoxName.lastNameDriver);
+                  box.remove(BoxName.passwordDriver);
+                  box.remove(BoxName.cardNumberDriver);
+                  box.remove(BoxName.expiryDateDriver);
+                  box.remove(BoxName.cardHolderNameDriver);
+                  box.remove(BoxName.vin);
+                  box.remove(BoxName.make);
+                  box.remove(BoxName.year);
+                  box.remove(BoxName.owner);
+                  box.remove(BoxName.onBoarding);
+                  box.remove(BoxName.agreeTerms);
+                  Get.offAll(OnBoardingPage());
                },
                child: Text(
                  'Sign Out'.tr,
--- a/lib/controller/home/map_passenger_controller.dart
+++ b/lib/controller/home/map_passenger_controller.dart
@@ -6,6 +6,8 @@ import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:google_polyline_algorithm/google_polyline_algorithm.dart';
 import 'package:location/location.dart';
+import 'package:ride/constant/colors.dart';
+import 'package:ride/constant/style.dart';
 import 'package:ride/views/home/map_page_passenger.dart';
 import '../../constant/api_key.dart';
 import '../../constant/box_name.dart';
@@ -273,77 +275,88 @@ class MapPassengerController extends GetxController {
  }

  changeConfirmRide() async {
-    PaymentController paymentController = Get.find<PaymentController>();
-    rideConfirm = true;
-    shouldFetch = true;
-    isBottomSheetShown = false;
-    timeToPassengerFromDriverAfterApplied = 60;
-    driverToken =
-        dataCarsLocationByPassenger['message'][carsOrder]['token'].toString();
-    update();
-    // print('rideConfirm= $rideConfirm');
+    if (dataCarsLocationByPassenger != 'failure') {
+      driverToken =
+          dataCarsLocationByPassenger['message'][carsOrder]['token'].toString();
+      PaymentController paymentController = Get.find<PaymentController>();
+      rideConfirm = true;
+      shouldFetch = true;
+      isBottomSheetShown = false;
+      timeToPassengerFromDriverAfterApplied = 60;

-    await getCarsLocationByPassenger();
-    await CRUD().post(link: AppLink.addRides, payload: {
-      "start_location": //'${data[0]['start_address']}',
-          '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
-      "end_location": //'${data[0]['end_address']}',
-          '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}',
-      "date": DateTime.now().toString(),
-      "time": DateTime.now().toString(),
-      "endtime": durationToAdd.toString(),
-      "price": totalPassenger.toString(),
-      "passenger_id": box.read(BoxName.passengerID).toString(),
-      "driver_id": dataCarsLocationByPassenger['message'][carsOrder]
-              ['driver_id']
-          .toString(),
-      "status": "waiting",
-      "price_for_driver": totalDriver.toString(),
-      "price_for_passenger": totalME.toString(),
-      "distance": distance.toString()
-    }).then((value) {
-      // print(jsonDecode(value)['message']);
-      // List<String> body = [
-      rideId = jsonDecode(value)['message'];
-      List<String> body = [
-        '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
-        '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}',
-        totalPassenger.toString(),
-        totalDriver.toString(),
-        duration.toString(),
-        distance.toString(),
-        dataCarsLocationByPassenger['message'][carsOrder]['driver_id']
-            .toString(),
-        box.read(BoxName.passengerID).toString(),
-        box.read(BoxName.name).toString(),
-        box.read(BoxName.tokenFCM).toString(),
-        box.read(BoxName.phone).toString(),
-        durationByPassenger.toString(),
-        distanceByPassenger.toString(),
-        paymentController.isWalletChecked.toString(),
-        dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(),
-        duration1.toString(),
-        rideId,
-        rideTimerBegin.toString(),
-        dataCarsLocationByPassenger['message'][carsOrder]['driver_id']
-            .toString(),
-        durationToRide.toString()
-      ];
-      FirebaseMessagesController().sendNotificationToDriverMAP(
-        'Order',
-        jsonDecode(value)['message'].toString(),
-        dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(),
-        body,
-      );
-      // print(dataCarsLocationByPassenger);
-      // print(dataCarsLocationByPassenger['message'][0]['token'].toString());
-    });
-    delayAndFetchRideStatus(rideId);
-    if (shouldFetch == false) {
-      startTimer();
      update();
+      // print('rideConfirm= $rideConfirm');
+
+      await getCarsLocationByPassenger();
+      await CRUD().post(link: AppLink.addRides, payload: {
+        "start_location": //'${data[0]['start_address']}',
+            '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
+        "end_location": //'${data[0]['end_address']}',
+            '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}',
+        "date": DateTime.now().toString(),
+        "time": DateTime.now().toString(),
+        "endtime": durationToAdd.toString(),
+        "price": totalPassenger.toString(),
+        "passenger_id": box.read(BoxName.passengerID).toString(),
+        "driver_id": dataCarsLocationByPassenger['message'][carsOrder]
+                ['driver_id']
+            .toString(),
+        "status": "waiting",
+        "price_for_driver": totalDriver.toString(),
+        "price_for_passenger": totalME.toString(),
+        "distance": distance.toString()
+      }).then((value) {
+        // print(jsonDecode(value)['message']);
+        // List<String> body = [
+        rideId = jsonDecode(value)['message'];
+        List<String> body = [
+          '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}',
+          '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}',
+          totalPassenger.toString(),
+          totalDriver.toString(),
+          duration.toString(),
+          distance.toString(),
+          dataCarsLocationByPassenger['message'][carsOrder]['driver_id']
+              .toString(),
+          box.read(BoxName.passengerID).toString(),
+          box.read(BoxName.name).toString(),
+          box.read(BoxName.tokenFCM).toString(),
+          box.read(BoxName.phone).toString(),
+          durationByPassenger.toString(),
+          distanceByPassenger.toString(),
+          paymentController.isWalletChecked.toString(),
+          dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(),
+          duration1.toString(),
+          rideId,
+          rideTimerBegin.toString(),
+          dataCarsLocationByPassenger['message'][carsOrder]['driver_id']
+              .toString(),
+          durationToRide.toString()
+        ];
+        FirebaseMessagesController().sendNotificationToDriverMAP(
+          'Order',
+          jsonDecode(value)['message'].toString(),
+          dataCarsLocationByPassenger['message'][carsOrder]['token'].toString(),
+          body,
+        );
+        // print(dataCarsLocationByPassenger);
+        // print(dataCarsLocationByPassenger['message'][0]['token'].toString());
+      });
+      delayAndFetchRideStatus(rideId);
+      if (shouldFetch == false) {
+        startTimer();
+        update();
+      }
+      update();
+    } else {
+      Get.defaultDialog(
+          title: 'No Car or Captain Found in your area.'.tr,
+          titleStyle: AppStyle.title,
+          middleText: 'Please Try anther time '.tr,
+          middleTextStyle: AppStyle.title.copyWith(color: AppColor.yellowColor),
+          confirm:
+              MyElevatedButton(title: 'Ok'.tr, onPressed: () => Get.back()));
    }
-    update();
  }

  void delayAndFetchRideStatus(String rideId) {
@@ -446,6 +459,7 @@ class MapPassengerController extends GetxController {
    });
    if (res == 'failure') {
      noCarString = true;
+      dataCarsLocationByPassenger = res;
      update();
      // Get.snackbar('No Car in your site.Sorry!'.tr, '',
      //     backgroundColor: AppColor.redColor);
--- a/lib/controller/notification/notification_captain_controller.dart
+++ b/lib/controller/notification/notification_captain_controller.dart
@@ -5,10 +5,10 @@ import 'package:ride/constant/style.dart';
 import 'package:ride/constant/table_names.dart';
 import 'package:ride/views/widgets/elevated_btn.dart';

-import '../../../constant/box_name.dart';
-import '../../../constant/links.dart';
-import '../../../main.dart';
-import '../../functions/crud.dart';
+import '../../constant/box_name.dart';
+import '../../constant/links.dart';
+import '../../main.dart';
+import '../functions/crud.dart';

 class NotificationCaptainController extends GetxController {
  bool isloading = false;
--- a/lib/controller/notification/passenger_notification_controller.dart
+++ b/lib/controller/notification/passenger_notification_controller.dart
@@ -0,0 +1,67 @@
+import 'dart:convert';
+
+import 'package:get/get.dart';
+import 'package:ride/controller/firebase/firbase_messge.dart';
+
+import '../../constant/box_name.dart';
+import '../../constant/links.dart';
+import '../../constant/style.dart';
+import '../../main.dart';
+import '../../views/widgets/elevated_btn.dart';
+import '../functions/crud.dart';
+
+class PassengerNotificationController extends GetxController {
+  bool isloading = false;
+  Map notificationData = {};
+
+  getNotifications() async {
+    isloading = true;
+    update();
+    var res = await CRUD().get(
+        link: AppLink.getNotificationPassenger,
+        payload: {'passenger_id': box.read(BoxName.passengerID)});
+    if (res == "failure") {
+      // print(res);
+      Get.defaultDialog(
+          title: 'There is no notification yet'.tr,
+          titleStyle: AppStyle.title,
+          middleText: '',
+          confirm: MyElevatedButton(
+              title: 'Back',
+              onPressed: () {
+                Get.back();
+                Get.back();
+              }));
+    }
+    notificationData = jsonDecode(res);
+    // sql.insertData(notificationData['message'], TableName.captainNotification);
+
+    // print(notificationData);
+    isloading = false;
+    update();
+  }
+
+  updateNotification(String id) async {
+    await CRUD().post(
+      link: AppLink.updateNotificationPassenger,
+      payload: {'isShown': 'true', 'id': id},
+    );
+    Get.back();
+    getNotifications();
+  }
+
+  addNotificationToPassenger(String title, body) async {
+    var res = CRUD().post(link: AppLink.addNotificationPassenger, payload: {
+      'title': title,
+      'body': body,
+    });
+    FirebaseMessagesController()
+        .sendNotificationToPassengerToken(title, body, 'token', []);
+  }
+
+  @override
+  void onInit() {
+    getNotifications();
+    super.onInit();
+  }
+}
--- a/lib/controller/profile/captain_profile_controller.dart
+++ b/lib/controller/profile/captain_profile_controller.dart
@@ -2,6 +2,7 @@ import 'dart:convert';

 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:http/http.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/constant/links.dart';
 import 'package:ride/controller/functions/crud.dart';
@@ -38,4 +39,28 @@ class CaptainProfileController extends GetxController {
      Get.back();
    }
  }
+
+  Map captainProfileData = {};
+  Future getProfileData() async {
+    var res = await CRUD().get(
+        link: AppLink.getCaptainProfile,
+        payload: {'id': box.read(BoxName.driverID)});
+    if (res != 'failure') {
+      var d = jsonDecode(res);
+      captainProfileData = d['message'];
+      update();
+      print(d['message']);
+      box.write(BoxName.sexDriver, d['message']['gender']);
+      box.write(BoxName.dobDriver, d['message']['birthdate']);
+    }
+  }
+
+  @override
+  void onInit() {
+    if (box.read(BoxName.dobDriver).toString().isEmpty) {
+      getProfileData();
+    }
+
+    super.onInit();
+  }
 }