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

1/27/2

Browse Source
This commit is contained in:
Hamza-Ayed
2024-01-27 01:13:34 +03:00
parent a63ebfe002
commit 18df215d0a
4 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/controller/home/map_passenger_controller.dart
View File

@@ -645,6 +645,7 @@ class MapPassengerController extends GetxController {
placesCoordinate[2], placesCoordinate[2],
placesCoordinate[3], placesCoordinate[3],
placesCoordinate[4], placesCoordinate[4],
cost.toStringAsFixed(2)
]; ];
FirebaseMessagesController().sendNotificationToDriverMAP( FirebaseMessagesController().sendNotificationToDriverMAP(
'Order', 'Order',

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

@@ -34,6 +34,11 @@ class OrderRequestPage extends StatelessWidget {
// Text(message.notification!.body.toString()), // Text(message.notification!.body.toString()),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Card(
elevation: 3,
color: myList[20].toString() == 'haveSteps'
? AppColor.greenColor
: AppColor.secondaryColor,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@@ -50,17 +55,24 @@ class OrderRequestPage extends StatelessWidget {
'Trip has Steps'.tr, 'Trip has Steps'.tr,
style: AppStyle.title, style: AppStyle.title,
) )
: Text('Rouats of Trip'.tr, style: AppStyle.title)), : Text('Rouats of Trip'.tr,
myList[13].toString() == style: AppStyle.title)),
Container(
color: myList[13].toString() == 'true'
? AppColor.deepPurpleAccent
: AppColor.greenColor,
child: myList[13].toString() ==
'true' //Visa or Cash Method from notify to driver 'true' //Visa or Cash Method from notify to driver
? Text( ? Text(
'Visa', 'Visa',
style: AppStyle.title, style: AppStyle.title,
) )
: Text('Cash', style: AppStyle.title) : Text('Cash', style: AppStyle.title),
)
], ],
), ),
), ),
),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
@@ -116,20 +128,23 @@ class OrderRequestPage extends StatelessWidget {
), ),
), ),
), ),
// Padding( Padding(
// padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
// child: RichText( child: Container(
// text: TextSpan( color: AppColor.deepPurpleAccent,
// text: 'Total For You is '.tr, child: RichText(
// style: AppStyle.title, text: TextSpan(
// children: [ text: 'Cost Of Trip IS '.tr,
// TextSpan( style: AppStyle.title,
// text: double.parse(myList[3]).toStringAsFixed(2), children: [
// style: AppStyle.headtitle2), TextSpan(
// ], text: double.parse(myList[26]).toStringAsFixed(2),
// ), style: AppStyle.headTitle2),
// ), ],
// ), ),
),
),
),
Padding( Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: RichText( child: RichText(
@@ -164,6 +179,7 @@ class OrderRequestPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
MyElevatedButton( MyElevatedButton(
kolor: AppColor.greenColor,
title: 'Apply Order'.tr, title: 'Apply Order'.tr,
onPressed: () async { onPressed: () async {
box.write(BoxName.statusDriverLocation, 'on'); box.write(BoxName.statusDriverLocation, 'on');

3
lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart
View File

@@ -153,7 +153,8 @@ class CashConfirmPageShown extends StatelessWidget {
kolor: AppColor.redColor, kolor: AppColor.redColor,
), ),
MyElevatedButton( MyElevatedButton(
title: 'Next'.tr, kolor: AppColor.greenColor,
title: 'Next as Cash \$\$!'.tr,
onPressed: () { onPressed: () {
paymentController.isCashChecked = true; paymentController.isCashChecked = true;
controller.changeCashConfirmPageShown(); controller.changeCashConfirmPageShown();

1
lib/views/home/map_widget.dart/payment_method.page.dart
View File

@@ -4,7 +4,6 @@ import 'package:get/get.dart';
import 'package:ride/constant/box_name.dart'; import 'package:ride/constant/box_name.dart';
import 'package:ride/controller/functions/secure_storage.dart'; import 'package:ride/controller/functions/secure_storage.dart';
import 'package:ride/controller/home/payment/credit_card_controller.dart'; import 'package:ride/controller/home/payment/credit_card_controller.dart';
import 'package:ride/main.dart';
import 'package:ride/views/widgets/elevated_btn.dart'; import 'package:ride/views/widgets/elevated_btn.dart';
import '../../../constant/colors.dart'; import '../../../constant/colors.dart';