4/16/1

2024-04-16 10:22:01 +03:00
parent a2d4cd845c
commit 24b3804045
18 changed files with 457 additions and 226 deletions
--- a/lib/views/home/Captin/home_captain/home_captin.dart
+++ b/lib/views/home/Captin/home_captain/home_captin.dart
@@ -1,5 +1,5 @@
+import 'package:SEFER/controller/payment/paymob.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:flutter_font_icons/flutter_font_icons.dart';
@@ -52,18 +52,9 @@ class HomeCaptain extends StatelessWidget {
                    orderRequestController.getRefusedOrderByCaptain(),
                icon: const Icon(Icons.get_app)),
          ),
-          GetBuilder<OrderRequestController>(
-              builder: (orderRequestController) => MyCircleContainer(
-                      child: Text(
-                    orderRequestController.countRefuse.toString(),
-                    style: AppStyle.title,
-                  ))),
          IconButton(
            onPressed: () {
-              // NotificationController()
-              //     .showNotification('Order', 'hi this is', 'tone2');
-              // Get.to(() => CallPage(callID: '111'));
-              // MapDriverController().getDriverScam();
+              PaymobManager().getPaymentKey(100, 'EGP');
            },
            icon: const Icon(
              Icons.call,
--- a/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
+++ b/lib/views/home/Captin/mapDriverWidgets/driver_end_ride_bar.dart
@@ -7,6 +7,7 @@ import 'package:vibration/vibration.dart';

 import '../../../../constant/colors.dart';
 import '../../../../constant/style.dart';
+import '../../../../controller/home/captin/home_captain_controller.dart';
 import '../../../../controller/home/captin/map_driver_controller.dart';
 import '../../../widgets/elevated_btn.dart';

@@ -134,9 +135,15 @@ GetBuilder<MapDriverController> driverEndRideBar() {
                              ),
                              Container(
                                decoration: AppStyle.boxDecoration1,
-                                child: Text(
-                                  mapDriverController.carType,
-                                  style: AppStyle.title,
+                                child: InkWell(
+                                  onTap: () {
+                                    print(Get.find<HomeCaptainController>()
+                                        .comfortPrice);
+                                  },
+                                  child: Text(
+                                    mapDriverController.carType,
+                                    style: AppStyle.title,
+                                  ),
                                ),
                              )
                            ],
--- a/lib/views/home/map_page_passenger.dart
+++ b/lib/views/home/map_page_passenger.dart
@@ -34,7 +34,7 @@ class MapPagePassenger extends StatelessWidget {
        child: Stack(
          children: [
            GoogleMapPassengerWidget(),
-            leftMainMenuIcons(),
+            leftMainMenuIcons(), PaymobPackage(),
            const PickerIconOnMap(),
            // PickerAnimtionContainerFormPlaces(),
            const MainBottomMenuMap(),
--- a/lib/views/home/map_widget.dart/left_main_menu_icons.dart
+++ b/lib/views/home/map_widget.dart/left_main_menu_icons.dart
@@ -1,15 +1,15 @@
-import 'dart:io';
-
+import 'package:SEFER/controller/payment/payment_controller.dart';
+import 'package:SEFER/controller/payment/paymob.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/main.dart';
+import 'package:paymob_payment/paymob_payment.dart';

 import '../../../constant/colors.dart';
 import '../../../controller/functions/tts.dart';
 import '../../../controller/home/map_passenger_controller.dart';
-import '../Captin/home_captain/driver_call_page.dart';

 GetBuilder<MapPassengerController> leftMainMenuIcons() {
  final textToSpeechController = Get.put(TextToSpeechController());
@@ -17,121 +17,146 @@ GetBuilder<MapPassengerController> leftMainMenuIcons() {
    builder: (controller) => Positioned(
        top: 85,
        left: 6,
-        child: Column(
-          children: [
-            AnimatedContainer(
-              duration: const Duration(microseconds: 200),
-              width: controller.widthMapTypeAndTraffic,
-              decoration: BoxDecoration(
-                  border: Border.all(),
-                  color: AppColor.secondaryColor,
-                  borderRadius: BorderRadius.circular(15)),
-              child: IconButton(
-                onPressed: () {
-                  controller.changeMapType();
-                  // Toast.show(context, 'This is a toast message!');
-                },
-                icon: const Icon(
-                  Icons.satellite_alt,
-                  size: 29,
+        child: Builder(builder: (context) {
+          return Column(
+            children: [
+              AnimatedContainer(
+                duration: const Duration(microseconds: 200),
+                width: controller.widthMapTypeAndTraffic,
+                decoration: BoxDecoration(
+                    border: Border.all(),
+                    color: AppColor.secondaryColor,
+                    borderRadius: BorderRadius.circular(15)),
+                child: IconButton(
+                  onPressed: () {
+                    controller.changeMapType();
+                    // Toast.show(context, 'This is a toast message!');
+                  },
+                  icon: const Icon(
+                    Icons.satellite_alt,
+                    size: 29,
+                  ),
                ),
              ),
-            ),
-            const SizedBox(
-              height: 5,
-            ),
-            AnimatedContainer(
-              duration: const Duration(microseconds: 200),
-              width: controller.widthMapTypeAndTraffic,
-              decoration: BoxDecoration(
-                  color: AppColor.secondaryColor,
-                  border: Border.all(),
-                  borderRadius: BorderRadius.circular(15)),
-              child: IconButton(
-                onPressed: () {
-                  controller.changeMapTraffic();
-                  // Toast.show(context, 'This is a toast message!');
-                },
-                icon: const Icon(
-                  Icons.streetview_sharp,
-                  size: 29,
+              const SizedBox(
+                height: 5,
+              ),
+              AnimatedContainer(
+                duration: const Duration(microseconds: 200),
+                width: controller.widthMapTypeAndTraffic,
+                decoration: BoxDecoration(
+                    color: AppColor.secondaryColor,
+                    border: Border.all(),
+                    borderRadius: BorderRadius.circular(15)),
+                child: IconButton(
+                  onPressed: () {
+                    controller.changeMapTraffic();
+                    // Toast.show(context, 'This is a toast message!');
+                  },
+                  icon: const Icon(
+                    Icons.streetview_sharp,
+                    size: 29,
+                  ),
                ),
              ),
-            ),
-            const SizedBox(
-              height: 5,
-            ),
-            // if (Platform.isIOS)
-            AnimatedContainer(
-              duration: const Duration(microseconds: 200),
-              width: controller.widthMapTypeAndTraffic,
-              decoration: BoxDecoration(
-                  color: AppColor.secondaryColor,
-                  border: Border.all(),
-                  borderRadius: BorderRadius.circular(15)),
-              child: IconButton(
-                onPressed: () {
-                  controller.mapController?.animateCamera(
-                      CameraUpdate.newLatLng(LatLng(
-                          controller.passengerLocation.latitude,
-                          controller.passengerLocation.longitude)));
-                },
-                icon: const Icon(
-                  Icons.location_on,
-                  size: 29,
+              const SizedBox(
+                height: 5,
+              ),
+              // if (Platform.isIOS)
+              AnimatedContainer(
+                duration: const Duration(microseconds: 200),
+                width: controller.widthMapTypeAndTraffic,
+                decoration: BoxDecoration(
+                    color: AppColor.secondaryColor,
+                    border: Border.all(),
+                    borderRadius: BorderRadius.circular(15)),
+                child: IconButton(
+                  onPressed: () {
+                    controller.mapController?.animateCamera(
+                        CameraUpdate.newLatLng(LatLng(
+                            controller.passengerLocation.latitude,
+                            controller.passengerLocation.longitude)));
+                  },
+                  icon: const Icon(
+                    Icons.location_on,
+                    size: 29,
+                  ),
                ),
              ),
-            ),
-            const SizedBox(
-              height: 5,
-            ),
-            AnimatedContainer(
-              duration: const Duration(microseconds: 200),
-              width: controller.widthMapTypeAndTraffic,
-              decoration: BoxDecoration(
-                  color: AppColor.secondaryColor,
-                  border: Border.all(),
-                  borderRadius: BorderRadius.circular(15)),
-              child: IconButton(
-                onPressed: () {
-                  textToSpeechController.speakText(
-                      '''hello this is  ${box.read(BoxName.name)}''');
-                },
-                icon: const Icon(
-                  Icons.voice_chat,
-                  size: 29,
+              const SizedBox(
+                height: 5,
+              ),
+              AnimatedContainer(
+                duration: const Duration(microseconds: 200),
+                width: controller.widthMapTypeAndTraffic,
+                decoration: BoxDecoration(
+                    color: AppColor.secondaryColor,
+                    border: Border.all(),
+                    borderRadius: BorderRadius.circular(15)),
+                child: IconButton(
+                  onPressed: () {
+                    textToSpeechController.speakText(
+                        '''hello this is  ${box.read(BoxName.name)}''');
+                  },
+                  icon: const Icon(
+                    Icons.voice_chat,
+                    size: 29,
+                  ),
                ),
              ),
-            ),
-            AnimatedContainer(
-              duration: const Duration(microseconds: 200),
-              width: controller.widthMapTypeAndTraffic,
-              decoration: BoxDecoration(
-                  color: AppColor.secondaryColor,
-                  border: Border.all(),
-                  borderRadius: BorderRadius.circular(15)),
-              child: IconButton(
-                onPressed: () {
-                  // NotificationController()
-                  //     .showNotification('Order', 'hi this is', 'tone1');
-                  // Get.to(() => DriverCallPage());
-                  // print(controller.carLocationsModels);
-                  // controller.getKazanPercent();
-                  // PassengerCallPage(
-                  //       channelName: '',
-                  //       token: '',
-                  //       remoteID: '',
-                  //     )
-                  // Get.to(() => const CallPage());
-                  // print(box.read(BoxName.lang));
-                },
-                icon: const Icon(
-                  Icons.call,
-                  size: 29,
+              AnimatedContainer(
+                duration: const Duration(microseconds: 200),
+                width: controller.widthMapTypeAndTraffic,
+                decoration: BoxDecoration(
+                    color: AppColor.secondaryColor,
+                    border: Border.all(),
+                    borderRadius: BorderRadius.circular(15)),
+                child: IconButton(
+                  onPressed: () async {
+                    // await PaymobManager().payWithPayMob(100, 'EGP');
+                    await Get.find<PaymentController>()
+                        .payWithPayMob(context, '11', 'EGP');
+                    // Initiates a payment with a card using the FlutterPaymob instance
+
+                    // NotificationController()
+                    //     .showNotification('Order', 'hi this is', 'tone1');
+                    // Get.to(() => DriverCallPage());
+                    // print(controller.carLocationsModels);
+                    // controller.getKazanPercent();
+                    // PassengerCallPage(
+                    //       channelName: '',
+                    //       token: '',
+                    //       remoteID: '',
+                    //     )
+                    // Get.to(() => const CallPage());
+                    // print(box.read(BoxName.lang));
+                  },
+                  icon: const Icon(
+                    Icons.call,
+                    size: 29,
+                  ),
                ),
              ),
-            ),
-          ],
-        )),
+            ],
+          );
+        })),
  );
 }
+
+class PaymobPackage extends StatelessWidget {
+  const PaymobPackage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+        onTap: () async {
+          await Get.find<PaymentController>()
+              .payWithPayMob(context, '11', 'EGP');
+        },
+        child: Container(
+          width: 50,
+          height: 50,
+          child: Text('pay'),
+        ));
+  }
+}
--- a/lib/views/home/profile/passenger_profile_page.dart
+++ b/lib/views/home/profile/passenger_profile_page.dart
@@ -305,14 +305,14 @@ class CountryPicker extends StatelessWidget {
  final ProfileController controller = Get.put(ProfileController());

  final List<String> countryOptions = [
-    'Jordan'.tr,
-    'USA'.tr,
-    'Eygpt'.tr,
-    'Turkey'.tr,
-    'Saudi Arabia'.tr,
-    'Qatar'.tr,
-    'Bahrain'.tr,
-    'Kuwait'.tr,
+    'Jordan',
+    'USA',
+    'Egypt',
+    'Turkey',
+    'Saudi Arabia',
+    'Qatar',
+    'Bahrain',
+    'Kuwait',
  ];

  CountryPicker({Key? key}) : super(key: key);
@@ -341,27 +341,33 @@ class CountryPicker extends StatelessWidget {
              itemExtent: 32,
              onSelectedItemChanged: (int index) {
                controller.setCountry(countryOptions[index]);
+                box.write(BoxName.countryCode,
+                    countryOptions[index]); // Save in English
              },
              children: List.generate(
                countryOptions.length,
                (index) => Center(
                  child: Text(
-                    countryOptions[index],
+                    countryOptions[index]
+                        .tr, // Display translated if not English
                    style: AppStyle.title,
                  ),
                ),
              ),
            ),
          ),
+
          MyElevatedButton(
-              title: 'Select Country'.tr,
-              onPressed: () {
-                Get.find<LoginController>()
-                    .saveCountryCode(controller.selectedCountry.toString());
-                box.write(
-                    BoxName.countryCode, controller.selectedCountry.toString());
-                Get.off(LoginPage());
-              })
+            title: 'Select Country'.tr, // Use translated text for button
+            onPressed: () {
+              Get.find<LoginController>().saveCountryCode(controller
+                  .selectedCountry
+                  .toString()); // No conversion needed
+              box.write(BoxName.countryCode,
+                  controller.selectedCountry); // Already saved in English
+              Get.off(LoginPage());
+            },
+          )
        ],
      );
    });