From edb05caa13f6f5399b068752321c2116e5aad236 Mon Sep 17 00:00:00 2001 From: Hamza-Ayed Date: Wed, 19 Jun 2024 02:38:56 +0300 Subject: [PATCH] 6/19/1 --- lib/controller/firebase/firbase_messge.dart | 27 ------- .../payment/payment_controller.dart | 63 +++++++-------- lib/controller/rate/rate_conroller.dart | 76 +++++-------------- lib/views/Rate/rate_captain.dart | 2 - 4 files changed, 50 insertions(+), 118 deletions(-) diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index f8e7ee7..d5f0653 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -381,33 +381,6 @@ class FirebaseMessagesController extends GetxController { confirm: MyElevatedButton( title: 'Yes'.tr, onPressed: () async { - var tip = (Get.find().totalPassenger) * - (double.parse(box.read(BoxName.tipPercentage.toString()))); - var res = await CRUD().post(link: AppLink.addTips, payload: { - 'passengerID': box.read(BoxName.passengerID), - 'driverID': driverList[0].toString(), - 'rideID': driverList[1].toString(), - 'tipAmount': tip.toString(), - }); - await CRUD().post(link: AppLink.addPassengersWallet, payload: { - 'passenger_id': box.read(BoxName.passengerID).toString(), - 'balance': ((-1) * tip).toString() - }); - - await CRUD().post(link: AppLink.addDriversWalletPoints, payload: { - 'driverID': driverList[0].toString(), - 'paymentID': '${Get.find().rideId}tip', - 'amount': (tip * 100).toString(), - 'paymentMethod': 'visa-tip', - }); - - if (res != 'failure') { - FirebaseMessagesController().sendNotificationToAnyWithoutData( - 'You Have Tips', - '${'${tip.toString()}\$${' tips\nTotal is'.tr}'} ${tip + (Get.find().totalPassenger)}', - driverList[2].toString(), - ); - } Get.to(() => RateDriverFromPassenger(), arguments: { 'driverId': driverList[0].toString(), 'rideId': driverList[1].toString(), diff --git a/lib/controller/payment/payment_controller.dart b/lib/controller/payment/payment_controller.dart index de37042..2468b35 100644 --- a/lib/controller/payment/payment_controller.dart +++ b/lib/controller/payment/payment_controller.dart @@ -79,43 +79,46 @@ class PaymentController extends GetxController { 'amount': amount.toString(), }); var d = jsonDecode(res); - print('paymentToken ${d['message']}'); + // print('paymentToken ${d['message']}'); return d['message']; } + Future addSeferWallet(String paymentMethod, point) async { + var seferToken = await generateTokenDriver(point); + await CRUD().post(link: AppLink.addSeferWallet, payload: { + 'amount': point.toString(), + 'paymentMethod': paymentMethod, + 'passengerId': box.read(BoxName.passengerID).toString(), + 'token': seferToken, + 'driverId': 'passenger', + }); + } + + Future addPassengersWallet(String point) async { + var token = await generateTokenPassenger(point); + await CRUD().post(link: AppLink.addPassengersWallet, payload: { + 'passenger_id': box.read(BoxName.passengerID).toString(), + 'balance': point, + 'token': token, + }); + } + addPassengerWallet() async { isLoading = true; update(); - // double sallaryAccountNowBeforeAdding = - // double.parse(box.read(BoxName.passengerWalletTotal).toString()); - var seferToken = await generateTokenPassenger(selectedAmount.toString()); - await CRUD().post(link: AppLink.addSeferWallet, payload: { - 'amount': selectedAmount.toString(), - 'paymentMethod': 'payout fee', - 'passengerId': box.read(BoxName.passengerID).toString(), - 'token': seferToken, - 'driverId': 'passenger', - }); - paymentToken = await generateTokenPassenger(selectedAmount.toString()); - await CRUD().post(link: AppLink.addPassengersWallet, payload: { - 'passenger_id': box.read(BoxName.passengerID).toString(), - 'balance': selectedAmount == 100 - ? '100' - : selectedAmount == 200 - ? '215' - : selectedAmount == 400 - ? '450' - : selectedAmount == 1000 - ? '1140' - : '0', - 'token': paymentToken, - }).then((value) { - getPassengerWallet(); - // sallaryAccountNowBeforeAdding = sallaryAccountNowBeforeAdding + - // double.parse(selectedAmount.toString()); - // box.write(BoxName.passengerWalletTotal, sallaryAccountNowBeforeAdding); - }); + await addSeferWallet('visa-in', selectedAmount.toString()); + await addPassengersWallet(selectedAmount == 100 + ? '100' + : selectedAmount == 200 + ? '215' + : selectedAmount == 400 + ? '450' + : selectedAmount == 1000 + ? '1140' + : '0'); + + getPassengerWallet(); isLoading = false; update(); diff --git a/lib/controller/rate/rate_conroller.dart b/lib/controller/rate/rate_conroller.dart index 45052c5..6297617 100644 --- a/lib/controller/rate/rate_conroller.dart +++ b/lib/controller/rate/rate_conroller.dart @@ -26,7 +26,7 @@ class RateController extends GetxController { rideId = Get.arguments['rideId']; driverId = Get.arguments['driverId']; price = Get.arguments['price']; - box.write(BoxName.tipPercentage, 0.0); + box.write(BoxName.tipPercentage, '0'); super.onInit(); } @@ -35,43 +35,6 @@ class RateController extends GetxController { update(); } - // void addRateToPassenger() async { - // // HomeCaptainController homeCaptainController = - // // Get.find(); - // // Get.put(MapDriverController()); - // if (selectedRateItemId < 1) { - // Get.defaultDialog( - // title: 'You Should choose rate figure'.tr, - // titleStyle: AppStyle.title, - // middleText: '', - // confirm: MyElevatedButton(title: 'Ok', onPressed: () => Get.back())); - // } else { - // await CRUD().post(link: AppLink.addRateToPassenger, payload: { - // 'passenger_id': passengerId, - // 'driverID': box.read(BoxName.driverID).toString(), - // 'rideId': rideId, - // 'rating': selectedRateItemId.toString(), - // 'comment': comment.text, - // }); - // await CRUD().sendEmail(AppLink.sendEmailToPassengerForTripDetails, { - // 'startLocation': - // Get.find().passengerLocation.toString(), - // 'endLocation': - // Get.find().passengerDestination.toString(), - // 'name': Get.find().passengerName.toString(), - // 'timeOfTrip': Get.find().timeOfOrder.toString(), - // 'fee': Get.find().totalPassenger.toString(), - // 'duration': Get.find().duration.toString(), - // 'phone': Get.find().passengerPhone.toString(), - // 'email': Get.find().passengerEmail.toString(), - // }); - // // homeCaptainController.isActive = true; - // // update(); - // // homeCaptainController.getPaymentToday(); - // Get.offAll(HomeCaptain()); - // } - // } - void addRateToDriver() async { if (selectedRateItemId < 1) { Get.defaultDialog( @@ -83,20 +46,16 @@ class RateController extends GetxController { double tip = 0; tip = (Get.find().totalPassenger) * (double.parse(box.read(BoxName.tipPercentage).toString())); - var res = await CRUD().post(link: AppLink.addTips, payload: { - 'passengerID': box.read(BoxName.passengerID), - 'driverID': Get.find().driverId.toString(), - 'rideID': Get.find().rideId.toString(), - 'tipAmount': tip.toString(), - }); - var token = await Get.find() - .generateTokenPassenger(((-1) * tip).toString()); - await CRUD().post(link: AppLink.addPassengersWallet, payload: { - 'passenger_id': box.read(BoxName.passengerID).toString(), - 'balance': ((-1) * tip).toString(), - 'token': token, - }); + if (tip > 0) { + var res = await CRUD().post(link: AppLink.addTips, payload: { + 'passengerID': box.read(BoxName.passengerID), + 'driverID': Get.find().driverId.toString(), + 'rideID': Get.find().rideId.toString(), + 'tipAmount': tip.toString(), + }); + await Get.find() + .addPassengersWallet(((-1) * tip).toString()); var token1 = await Get.find().generateTokenDriver( box.read(BoxName.countryCode) == 'Egypt' ? tip.toStringAsFixed(0) @@ -110,14 +69,13 @@ class RateController extends GetxController { 'paymentMethod': 'visa-tip', 'token': token1, }); - } - - if (res != 'failure') { - FirebaseMessagesController().sendNotificationToAnyWithoutData( - 'You Have Tips', - '${'${tip.toString()}\$${' tips\nTotal is'.tr}'} ${tip + (Get.find().totalPassenger)}', - Get.find().driverToken.toString(), - ); + if (res != 'failure') { + FirebaseMessagesController().sendNotificationToAnyWithoutData( + 'You Have Tips', + '${'${tip.toString()}\$${' tips\nTotal is'.tr}'} ${tip + (Get.find().totalPassenger)}', + Get.find().driverToken.toString(), + ); + } } } await CRUD().post(link: AppLink.addRateToDriver, payload: { diff --git a/lib/views/Rate/rate_captain.dart b/lib/views/Rate/rate_captain.dart index 0312af1..b680eb3 100644 --- a/lib/views/Rate/rate_captain.dart +++ b/lib/views/Rate/rate_captain.dart @@ -3,13 +3,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import 'package:get/get.dart'; -import '../../constant/box_name.dart'; import '../../constant/colors.dart'; import '../../constant/style.dart'; import '../../controller/firebase/firbase_messge.dart'; import '../../controller/payment/payment_controller.dart'; import '../../controller/rate/rate_conroller.dart'; -import '../../main.dart'; import '../widgets/elevated_btn.dart'; import '../widgets/my_scafold.dart';