1/27/2

lib/controller/home/map_passenger_controller.dart

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

lib/views/home/Captin/orderCaptin/order_request_page.dart

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

lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart

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

lib/views/home/map_widget.dart/payment_method.page.dart

@@ -4,7 +4,6 @@ import 'package:get/get.dart';
 import 'package:ride/constant/box_name.dart';
 import 'package:ride/controller/functions/secure_storage.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 '../../../constant/colors.dart';