Hamza/driver_tripz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

25-5-30/1

Browse Source
This commit is contained in:
Hamza-Ayed
2025-05-30 16:57:40 +03:00
parent f3ada31b3b
commit ce3ae01a75
64 changed files with 857 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
lib/views/home/Captin/home_captain/widget/left_menu_map_captain.dart
View File

@@ -1,8 +1,10 @@
import 'dart:io';
import 'package:sefer_driver/constant/box_name.dart';
import 'package:sefer_driver/controller/auth/captin/login_captin_controller.dart';
import 'package:sefer_driver/controller/firebase/local_notification.dart';
import 'package:sefer_driver/main.dart';
import 'package:sefer_driver/views/auth/captin/cards/sms_signup.dart';
import 'package:sefer_driver/views/home/Captin/orderCaptin/vip_order_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_font_icons/flutter_font_icons.dart';
@@ -50,7 +52,7 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
// '${'Please wait'.tr} $minutesLeft ${"minutes before trying again.".tr}',
// '');
NotificationController1().showNotification(
'Sefer Driver'.tr,
'Tripz Driver'.tr,
'${'Please wait'.tr} $minutesLeft ${"minutes before trying again.".tr}',
'ding',
'');
@@ -93,46 +95,26 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
)
: const SizedBox(),
// : const SizedBox(),
// AnimatedContainer(
// duration: const Duration(microseconds: 200),
// width: controller.widthMapTypeAndTraffic,
// decoration: BoxDecoration(
// color: AppColor.secondaryColor,
// border: Border.all(color: AppColor.blueColor),
// borderRadius: BorderRadius.circular(15)),
// child: Builder(builder: (context) {
// return IconButton(
// onPressed: () async {
// print("Current working directory: ${Directory.current.path}");
// print(
// "pubspec.yaml exists here?: ${await File('${Directory.current.path}/pubspec.yaml').exists()}");
// try {
// await LingoHunter.extractAndCreateTranslationFiles(
// baseLang: 'en',
// langs: ['ar', 'fr', 'es'],
// // Remove projectDirectory: Let it auto-detect.
// // projectDirectory: '/Users/hamzaaleghwairyeen/development/App/driver_sefer',
// outputDirectory:
// '/Users/hamzaaleghwairyeen/development/App/driver_sefer/assets/lang',
// additionalRegExps: [
// RegExp(r'translate\("([^\"]+)"\)'),
// ],
// );
// print(
// "✅ Translation files generated successfully (auto-detected).");
// } catch (e) {
// print("Error: $e");
// }
// },
// icon: const Icon(
// FontAwesome5.grin_tears,
// size: 29,
// color: AppColor.blueColor,
// ),
// );
// }),
// ),
AnimatedContainer(
duration: const Duration(microseconds: 200),
width: controller.widthMapTypeAndTraffic,
decoration: BoxDecoration(
color: AppColor.secondaryColor,
border: Border.all(color: AppColor.blueColor),
borderRadius: BorderRadius.circular(15)),
child: Builder(builder: (context) {
return IconButton(
onPressed: () async {
print(box.read(BoxName.paymentLink));
},
icon: const Icon(
FontAwesome5.grin_tears,
size: 29,
color: AppColor.blueColor,
),
);
}),
),
const SizedBox(
height: 5,

62
lib/views/home/Captin/orderCaptin/order_speed_request.dart
View File

@@ -327,25 +327,7 @@ class OrderSpeedRequest extends StatelessWidget {
'driver_id': box.read(BoxName.driverID),
});
}
// .then((value) {
// var json = jsonDecode(res);
if (res == "failure") {
Get.defaultDialog(
title:
"This ride is already taken by another driver."
.tr,
middleText: '',
titleStyle: AppStyle.title,
middleTextStyle: AppStyle.title,
confirm: MyElevatedButton(
title: 'Ok'.tr,
onPressed: () {
Get.back();
Get.back();
// Get.back();
}));
} else if (jsonDecode(res)['status'] == "success") {
if (res != "failure") {
box.write(BoxName.statusDriverLocation, 'on');
orderRequestController.changeApplied();
List<String> bodyToPassenger = [
@@ -357,33 +339,29 @@ class OrderSpeedRequest extends StatelessWidget {
.sendNotificationToPassengerToken(
'Accepted Ride',
'your ride is applied'.tr,
// arguments['DriverList'][9].toString(),
orderRequestController
.arguments['DriverList'][9]
.toString(),
// box.read(BoxName.tokenDriver).toString(),
bodyToPassenger,
'start.wav');
await CRUD().postFromDialogue(
CRUD().postFromDialogue(
link: AppLink.addDriverOrder,
payload: {
'driver_id': orderRequestController.myList[6]
.toString(),
// box.read(BoxName.driverID).toString(),
'order_id':
orderRequestController.body.toString(),
'status': 'Apply'
});
await CRUD().postFromDialogue(
link: AppLink.addDriverOrder,
payload: {
'driver_id': orderRequestController.myList[6]
.toString(),
// box.read(BoxName.driverID).toString(),
'order_id': orderRequestController.myList[16]
.toString(),
'status': 'Apply'
});
// CRUD().postFromDialogue(
// link: AppLink.addDriverOrder,
// payload: {
// 'driver_id': orderRequestController.myList[6]
// .toString(),
// 'order_id': orderRequestController.myList[16]
// .toString(),
// 'status': 'Apply'
// });
if (AppLink.endPoint != AppLink.seferCairoServer) {
CRUD().post(
@@ -402,9 +380,6 @@ class OrderSpeedRequest extends StatelessWidget {
}
Get.back();
// 'Arguments passed to PassengerLocationMapPage:');
// 'Payment Method: ${orderRequestController.myList[13] == 'true' ? 'visa' : 'cash'}');
box.write(BoxName.rideArguments, {
'passengerLocation':
orderRequestController.myList[0].toString(),
@@ -473,6 +448,21 @@ class OrderSpeedRequest extends StatelessWidget {
});
Get.to(() => PassengerLocationMapPage(),
arguments: box.read(BoxName.rideArguments));
} else {
Get.defaultDialog(
title:
"This ride is already taken by another driver."
.tr,
middleText: '',
titleStyle: AppStyle.title,
middleTextStyle: AppStyle.title,
confirm: MyElevatedButton(
title: 'Ok'.tr,
onPressed: () {
Get.back();
Get.back();
// Get.back();
}));
}
// });
// Get.back();