4/12/7

lib/constant/links.dart

@@ -14,8 +14,8 @@ class AppLink {
   static String addTokensDriver = "$server/ride/firebase/addDriver.php";
 
   //=======================Wallet===================
-  static String wallet = '$server/ride/passengerWallet/';
+  static String wallet = '$server/ride/passengerWallet';
-  static String walletDriver = '$server/ride/driverWallet/';
+  static String walletDriver = '$server/ride/driverWallet';
   static String getAllPassengerTransaction =
       "$wallet/getAllPassengerTransaction.php";
   static String getWalletByPassenger = "$wallet/getWalletByPassenger.php";

lib/controller/firebase/firbase_messge.dart

@@ -173,6 +173,7 @@ class FirebaseMessagesController extends GetxController {
     } else if (message.notification!.title! == 'RideIsBegin') {
       Get.find<MapPassengerController>().getBeginRideFromDriver();
       // Get.snackbar('RideIsBegin', '', backgroundColor: AppColor.greenColor);
+      box.write(BoxName.passengerWalletTotal, '0');
       NotificationController()
           .showNotification('Trip is Begin'.tr, ''.tr, 'start');
       update();

lib/controller/home/captin/map_driver_controller.dart

@@ -481,6 +481,7 @@ class MapDriverController extends GetxController {
       });
       print('passengerWalletBurc  aft  ${double.parse(passengerWalletBurc)}');
     }
+
     double pointsSubstraction = 0;
     pointsSubstraction = double.parse(paymentAmount) *
         (-1) *

lib/controller/home/map_passenger_controller.dart

@@ -668,6 +668,7 @@ class MapPassengerController extends GetxController {
     rideTimerBegin = false;
     box.write(BoxName.arrivalTime, '');
     remainingTimeTimerRideBegin = 0;
+    box.write(BoxName.passengerWalletTotal, '0');
     update();
   }
 

lib/controller/home/profile/order_history_controller.dart

@@ -21,7 +21,7 @@ class OrderHistoryController extends GetxController {
       'passenger_id': box.read(BoxName.passengerID).toString(),
     });
     if (res.toString() == 'failure') {
-      Get.snackbar('failure', 'message');
+      // Get.snackbar('failure', 'message');
       isloading = false;
       update();
     } else {

lib/controller/local/translations.dart

@@ -440,6 +440,7 @@ class MyTranslation extends Translations {
           'Submit Question': "طرح السؤال",
           'Please enter your Question.': "الرجاء إدخال سؤالك.",
           'Help Details': "تفاصيل المساعدة",
+          'No trip yet found': 'لم يتم حجز أي رحلة بعد ',
           'No Response yet.': "لا يوجد رد بعد.",
           ' You Earn today is ': " ما حصلت عليه اليوم هو",
           ' You Have in': "لديك في",

lib/controller/payment/passenger_wallet_history_controller.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:SEFER/constant/style.dart';
+import 'package:SEFER/views/widgets/elevated_btn.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/constant/links.dart';
@@ -16,11 +18,23 @@ class PassengerWalletHistoryController extends GetxController {
     var res = await CRUD().get(
         link: AppLink.getPassengerWalletArchive,
         payload: {'passenger_id': box.read(BoxName.passengerID)});
-
+    if (res != 'failure') {
       archive = jsonDecode(res)['message'];
       print(archive);
       isLoading = false;
       update();
+    } else {}
+    Get.defaultDialog(
+        barrierDismissible: false,
+        title: 'No wallet record found'.tr,
+        titleStyle: AppStyle.title,
+        middleText: '',
+        confirm: MyElevatedButton(
+            title: 'OK'.tr,
+            onPressed: () {
+              Get.back();
+              Get.back();
+            }));
   }
 
   @override

lib/views/home/map_page_passenger.dart

@@ -42,7 +42,8 @@ class MapPagePassenger extends StatelessWidget {
             const MapMenuWidget(),
             const MenuIconMapPageWidget(),
             buttomSheetMapPage(),
-            CarDetailsTypeToChoose(), const Burc(),
+            CarDetailsTypeToChoose(),
+            const Burc(),
             const ApplyOrderWidget(),
             // hexagonClipper(),
             const CancelRidePageShow(),

lib/views/home/map_widget.dart/car_details_widget_to_go.dart

@@ -422,7 +422,7 @@ class Burc extends StatelessWidget {
                                             ' in your'
                                         .tr +
                                     ' ${AppInformation.appName}'
-                                            '\n wallet due to a previous trip.'
+                                            ' wallet due to a previous trip.'
                                         .tr,
                                 textAlign: TextAlign.center,
                                 style: AppStyle.subtitle,

lib/views/home/my_wallet/payment_history_passenger_page.dart

@@ -18,6 +18,13 @@ class PaymentHistoryPassengerPage extends StatelessWidget {
           GetBuilder<PassengerWalletHistoryController>(
             builder: (controller) => controller.isLoading
                 ? const MyCircularProgressIndicator()
+                : controller.archive.isEmpty
+                    ? Center(
+                        child: Text(
+                          'No wallet record found'.tr,
+                          style: AppStyle.title,
+                        ),
+                      )
                     : ListView.builder(
                         itemCount: controller.archive.length,
                         itemBuilder: (BuildContext context, int index) {
@@ -30,7 +37,8 @@ class PaymentHistoryPassengerPage extends StatelessWidget {
                                       ? AppColor.redColor.withOpacity(.4)
                                       : AppColor.greenColor.withOpacity(.4)),
                               child: Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceBetween,
                                 children: [
                                   Text(
                                     list['balance'],

lib/views/home/profile/order_history.dart

@@ -1,8 +1,11 @@
+import 'package:SEFER/controller/home/map_passenger_controller.dart';
+import 'package:SEFER/main.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/style.dart';
 import 'package:SEFER/views/widgets/my_scafold.dart';
 import 'package:SEFER/views/widgets/mycircular.dart';
+import 'package:google_maps_flutter/google_maps_flutter.dart';
 
 import '../../../constant/colors.dart';
 import '../../../controller/functions/launch.dart';
@@ -23,36 +26,28 @@ class OrderHistory extends StatelessWidget {
         GetBuilder<OrderHistoryController>(
           builder: (orderHistoryController) => orderHistoryController.isloading
               ? const MyCircularProgressIndicator()
+              : orderHistoryController.orderHistoryListPassenger.isEmpty
+                  ? Center(
+                      child: Text(
+                        'No trip yet found'.tr,
+                        style: AppStyle.headTitle2,
+                      ),
+                    )
                   : ListView.builder(
-                  itemCount:
+                      itemCount: orderHistoryController
-                      orderHistoryController.orderHistoryListPassenger.length,
+                          .orderHistoryListPassenger.length,
                       itemBuilder: (BuildContext context, int index) {
-                    final rides =
+                        final rides = orderHistoryController
-                        orderHistoryController.orderHistoryListPassenger[index];
+                            .orderHistoryListPassenger[index];
                         return Padding(
                           padding: const EdgeInsets.all(8.0),
                           child: Container(
-                        decoration: const BoxDecoration(
+                            decoration: AppStyle.boxDecoration1,
-                            borderRadius: BorderRadius.all(Radius.circular(12)),
-                            color: AppColor.secondaryColor,
-                            boxShadow: [
-                              BoxShadow(
-                                  color: AppColor.accentColor,
-                                  offset: Offset(-3, -3),
-                                  blurRadius: 0,
-                                  spreadRadius: 0,
-                                  blurStyle: BlurStyle.outer),
-                              BoxShadow(
-                                  color: AppColor.accentColor,
-                                  offset: Offset(3, 3),
-                                  blurRadius: 0,
-                                  spreadRadius: 0,
-                                  blurStyle: BlurStyle.outer)
-                            ]),
                             child: Padding(
                               padding: const EdgeInsets.all(8.0),
                               child: Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                mainAxisAlignment:
+                                    MainAxisAlignment.spaceBetween,
                                 children: [
                                   InkWell(
                                     onTap: () {
@@ -61,9 +56,43 @@ class OrderHistory extends StatelessWidget {
                                       // print(mapUrl);
                                       showInBrowser(mapUrl);
                                     },
-                                child: Text(
+                                    child: SizedBox(
-                                  'Click here to Show it in Map'.tr,
+                                      height: Get.height * .2,
-                                  style: AppStyle.title,
+                                      width: Get.width * .75,
+                                      child: GoogleMap(
+                                        initialCameraPosition: CameraPosition(
+                                          target: Get.find<
+                                                  MapPassengerController>()
+                                              .passengerLocation, // Assuming passenger location is available
+                                          zoom: 15,
+                                        ),
+                                        polylines: {
+                                          Polyline(
+                                            zIndex: 2,
+                                            consumeTapEvents: true,
+                                            geodesic: true,
+                                            endCap: Cap.buttCap,
+                                            startCap: Cap.buttCap,
+                                            visible: true,
+                                            polylineId:
+                                                const PolylineId('route'),
+                                            points: [
+                                              LatLng(
+                                                  rides['start_location']
+                                                      ['latitude'],
+                                                  rides['start_location']
+                                                      ['longitude']),
+                                              LatLng(
+                                                  rides['end_location']
+                                                      ['latitude'],
+                                                  rides['end_location']
+                                                      ['longitude']),
+                                            ],
+                                            color: AppColor.primaryColor,
+                                            width: 5,
+                                          ),
+                                        },
+                                      ),
                                     ),
                                   ),
                                   Column(
@@ -81,8 +110,8 @@ class OrderHistory extends StatelessWidget {
                                         style: rides['status'] != 'Canceled'.tr
                                             ? AppStyle.subtitle.copyWith(
                                                 color: AppColor.greenColor)
-                                        : AppStyle.subtitle
+                                            : AppStyle.subtitle.copyWith(
-                                            .copyWith(color: AppColor.redColor),
+                                                color: AppColor.redColor),
                                       ),
                                       Text(
                                         '${'Price is'.tr} ${rides['price']}',

lib/views/home/profile/taarif_page.dart

@@ -1,3 +1,5 @@
+import 'package:SEFER/constant/box_name.dart';
+import 'package:SEFER/main.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/style.dart';
@@ -25,24 +27,33 @@ class TaarifPage extends StatelessWidget {
                   // decoration: AppStyle.boxDecoration,
                   children: [
                     Text('Minimum fare'.tr, style: AppStyle.title),
-                    Text('1 ${'JOD'.tr}', style: AppStyle.title),
+                    box.read(BoxName.countryCode) == 'Jordan'
+                        ? Text('1 ${'JOD'.tr}', style: AppStyle.title)
+                        : Text('20 ${'LE'.tr}', style: AppStyle.title),
                   ],
                 ),
                 TableRow(
                   children: [
                     Text('Maximum fare'.tr, style: AppStyle.title),
-                    Text('200 ${'JOD'.tr}', style: AppStyle.title),
+                    box.read(BoxName.countryCode) == 'Jordan'
+                        ? Text('200 ${'JOD'.tr}', style: AppStyle.title)
+                        : Text('15000 ${'LE'.tr}', style: AppStyle.title),
                   ],
                 ),
                 TableRow(
                   children: [
                     Text('Flag-down fee'.tr, style: AppStyle.title),
-                    Text('0.47 ${'JOD'.tr}', style: AppStyle.title),
+                    box.read(BoxName.countryCode) == 'Jordan'
+                        ? Text('0.47 ${'JOD'.tr}', style: AppStyle.title)
+                        : Text('15 ${'LE'.tr}', style: AppStyle.title),
                   ],
                 ),
                 TableRow(
                   children: [
-                    Text('0.05 ${'JOD'.tr}/min and 0.21 ${'JOD'.tr}/km',
+                    box.read(BoxName.countryCode) == 'Jordan'
+                        ? Text('0.05 ${'JOD'.tr}/min and 0.21 ${'JOD'.tr}/km',
+                            style: AppStyle.title)
+                        : Text('1 ${'LE'.tr}/min and 4 ${'LE'.tr}/km',
                             style: AppStyle.title),
                     Text('Including Tax'.tr, style: AppStyle.title),
                   ],
@@ -52,7 +63,7 @@ class TaarifPage extends StatelessWidget {
             const SizedBox(height: 10),
             Text('BookingFee'.tr, style: AppStyle.headTitle2),
             const SizedBox(height: 10),
-            Text('4.17%', style: AppStyle.title),
+            Text('10%', style: AppStyle.title),
             const SizedBox(height: 20),
             Text('Morning'.tr, style: AppStyle.headTitle2),
             const SizedBox(height: 10),