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

6/18/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-06-18 12:17:24 +03:00
parent 95228ad855
commit a8921df473
14 changed files with 107 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/views/home/Captin/driver_map_page.dart
View File

@@ -21,6 +21,8 @@ class PassengerLocationMapPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
Get.put(MapDriverController());
// Get.put(MapDriverController())
// .startTimerToShowPassengerInfoWindowFromDriver();
return MyScafolld(
title: 'Map Passenger'.tr,

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

@@ -156,24 +156,25 @@ GetBuilder<HomeCaptainController> leftMainMenuCaptainIcons() {
),
),
),
// 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: IconButton(
// onPressed: () {
// },
// 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: IconButton(
onPressed: () {
Get.to(() => PassengerLocationMapPage(),
arguments: box.read(BoxName.rideArguments));
},
icon: const Icon(
FontAwesome5.grin_tears,
size: 29,
color: AppColor.blueColor,
),
),
),
],
)),
);

3
lib/views/home/Captin/mapDriverWidgets/passenger_info_window.dart
View File

@@ -169,7 +169,8 @@ class PassengerInfoWindow extends StatelessWidget {
Text("cost is ".tr,
style: AppStyle.title),
Text(
controller.totalPassenger.toString(),
controller.totalPricePassenger
.toString(),
style: AppStyle.number,
),
],

8
lib/views/home/Captin/orderCaptin/order_request_page.dart
View File

@@ -329,7 +329,7 @@ class OrderRequestPage extends StatelessWidget {
bodyToPassenger,
);
Get.back();
Get.to(() => PassengerLocationMapPage(), arguments: {
box.write(BoxName.rideArguments, {
'passengerLocation': myList[0].toString(),
'passengerDestination': myList[1].toString(),
'Duration': myList[4].toString(),
@@ -357,7 +357,7 @@ class OrderRequestPage extends StatelessWidget {
'step2': myList[23].toString(),
'step3': myList[24].toString(),
'step4': myList[25].toString(),
'passengerWalletBurc': myList[27].toString(),
'passengerWalletBurc': myList[26].toString(),
'timeOfOrder': DateTime.now().toString(),
'totalPassenger': myList[2].toString(),
'carType': myList[31].toString(),
@@ -365,6 +365,10 @@ class OrderRequestPage extends StatelessWidget {
'startNameLocation': myList[29].toString(),
'endNameLocation': myList[30].toString(),
});
print(
'passengerID =${box.read(BoxName.rideArguments)}');
Get.to(() => PassengerLocationMapPage(),
arguments: box.read(BoxName.rideArguments));
},
),
GetBuilder<OrderRequestController>(

12
lib/views/home/my_wallet/points_captain.dart
View File

@@ -49,9 +49,9 @@ class PointsCaptain extends StatelessWidget {
? 'EGP'
: 'JOD', () async {
await captainWalletController.addDriverPayment(
'visa', pricePoint);
'visa-in', pricePoint);
await captainWalletController.addDriverWallet(
'visa', countPoint);
'visa-in', countPoint);
await captainWalletController
.getCaptainWalletFromBuyPoints();
});
@@ -70,9 +70,9 @@ class PointsCaptain extends StatelessWidget {
? 'EGP'
: 'JOD', () async {
await captainWalletController.addDriverPayment(
'visa', pricePoint);
'visa-in', pricePoint);
await captainWalletController.addDriverWallet(
'visa', countPoint);
'visa-in', countPoint);
await captainWalletController
.getCaptainWalletFromBuyPoints();
});
@@ -84,9 +84,9 @@ class PointsCaptain extends StatelessWidget {
box.read(BoxName.countryCode) == 'Jordan' ? 'jod' : 'egp',
() async {
await captainWalletController.addDriverPayment(
'visa', pricePoint);
'visa-in', pricePoint);
await captainWalletController.addDriverWallet(
'visa', countPoint);
'visa-in', countPoint);
await captainWalletController.getCaptainWalletFromBuyPoints();
});
},

5
lib/views/home/my_wallet/transfer_budget_page.dart
View File

@@ -8,7 +8,6 @@ import 'package:SEFER/views/widgets/mycircular.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import '../../../constant/colors.dart';
import '../../../controller/home/payment/captain_wallet_controller.dart';
class TransferBudgetPage extends StatelessWidget {
@@ -110,7 +109,9 @@ class TransferBudgetPage extends StatelessWidget {
onPressed: () async {
await captainWalletController
.addtransferDriversWallet(
'Transfer');
'TransferFrom',
'TransferTo',
);
})
: const SizedBox()
],

4
lib/views/home/my_wallet/walet_captain.dart
View File

@@ -29,7 +29,7 @@ class WalletCaptain extends StatelessWidget {
Get.put(CaptainWalletController());
@override
Widget build(BuildContext context) {
Get.put(MapDriverController()).totalPassenger = '0';
Get.put(MapDriverController()).totalPricePassenger = '0';
return MyScafolld(
title: 'Driver Wallet'.tr,
body: [
@@ -222,7 +222,7 @@ class WalletCaptain extends StatelessWidget {
),
),
confirm: MyElevatedButton(
title: 'Pay',
title: 'Pay'.tr,
onPressed: () async {
if (double.parse(
captainWalletController