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

6/19/1

Browse Source
This commit is contained in:
Hamza-Ayed
2024-06-19 23:03:14 +03:00
parent 9a8829f3f1
commit fcce6b9be5
6 changed files with 295 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/controller/home/payment/captain_wallet_controller.dart
View File

@@ -212,6 +212,8 @@ class CaptainWalletController extends GetxController {
amountToNewDriverMap[0]['token'].toString(),
[],
);
await addSeferWallet('payout fee', '5');
Get.defaultDialog(
title: 'transfer Successful'.tr,
middleText: '',
@@ -221,15 +223,7 @@ class CaptainWalletController extends GetxController {
onPressed: () async {
Get.back();
Get.back();
var seferToken = await Get.find<CaptainWalletController>()
.generateToken('5');
await CRUD().post(link: AppLink.addSeferWallet, payload: {
'amount': '5',
'paymentMethod': 'payout fee',
'passengerId': 'driver',
'token': seferToken,
'driverId': box.read(BoxName.driverID).toString(),
});
await refreshCaptainWallet();
}));
}

12
lib/controller/home/payment/paymob_payout.dart
View File

@@ -78,15 +78,9 @@ class PaymobPayout extends GetxController {
'token': paymentToken,
'driverID': box.read(BoxName.driverID).toString(),
});
var seferToken = await Get.find<CaptainWalletController>()
.generateToken(payOutFee.toString());
await CRUD().post(link: AppLink.addSeferWallet, payload: {
'amount': ((-1) * (double.parse(dec['amount']))).toStringAsFixed(0),
'paymentMethod': 'payout fee',
'passengerId': 'driver',
'token': seferToken,
'driverId': box.read(BoxName.driverID).toString(),
});
await Get.find<CaptainWalletController>()
.addSeferWallet('payout fee myself', payOutFee.toString());
Get.snackbar('Transaction successful'.tr,
'${'Transaction successful'.tr} ${dec['amount']}',
backgroundColor: AppColor.greenColor);

15
lib/controller/rate/rate_conroller.dart
View File

@@ -12,6 +12,8 @@ import 'package:SEFER/main.dart';
import 'package:SEFER/views/home/Captin/home_captain/home_captin.dart';
import 'package:SEFER/views/widgets/elevated_btn.dart';
import '../home/payment/captain_wallet_controller.dart';
// import '../home/captin/home_captain_controller.dart';
class RateController extends GetxController {
@@ -54,21 +56,25 @@ class RateController extends GetxController {
if (value != 'failure') {
Get.snackbar('Wallet Added'.tr, '',
backgroundColor: AppColor.greenColor);
if (double.parse(
Get.find<CaptainWalletController>().totalAmountVisa) >
remainingFee) {
var paymentToken3 = await Get.find<MapDriverController>()
.generateTokenPassenger(remainingFee.toString());
.generateTokenDriver((-1 * remainingFee).toString());
await CRUD().post(link: AppLink.addDrivePayment, payload: {
'rideId': 'remain$rideId',
'amount': remainingFee.toString(),
'amount': (-1 * remainingFee).toString(),
'payment_method': 'Remainder',
'passengerID': passengerId,
'token': paymentToken3,
'driverID': box.read(BoxName.driverID).toString(),
});
} else {
double pointsSubtraction = 0;
pointsSubtraction = remainingFee * (-1); // for egypt /100
var paymentToken4 = await Get.find<MapDriverController>()
.generateTokenPassenger((pointsSubtraction).toStringAsFixed(0));
.generateTokenDriver((pointsSubtraction).toStringAsFixed(0));
var res = await CRUD()
.post(link: AppLink.addDriversWalletPoints, payload: {
'paymentID': 'rideId$rideId',
@@ -77,6 +83,7 @@ class RateController extends GetxController {
'token': paymentToken4,
'driverID': box.read(BoxName.driverID).toString(),
});
}
FirebaseMessagesController().sendNotificationToAnyWithoutData(
'Wallet Added',

75
lib/models/ai_query.sql
View File

@@ -23,67 +23,66 @@ WHERE
c.complaint_type = 'Passenger' AND c.passenger_id = '100393163265770158312';
-- Admin panel dashboard
SELECT
(
SELECT
COALESCE((
SELECT
COUNT(`email`)
FROM
`passengers`
) AS countPassengers,
(
), 0) AS countPassengers,
COALESCE((
SELECT
COUNT(`email`)
FROM
`driver`
) AS countDriver,
(
), 0) AS countDriver,
COALESCE((
SELECT
COUNT(`id`)
FROM
`ride`
) AS countRide,
(
), 0) AS countRide,
COALESCE((
SELECT
COUNT(`id`)
FROM
`passengers`
WHERE
`passengers`.`created_at` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
) AS countPassengersThisMonth,
(
), 0) AS countPassengersThisMonth,
COALESCE((
SELECT
COUNT(`id`)
FROM
`ride`
WHERE
`ride`.`created_at` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
) AS countRideThisMonth,
(
), 0) AS countRideThisMonth,
COALESCE((
SELECT
COUNT(`id`)
FROM
`driver`
WHERE
`driver`.`created_at` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
) AS countDriverThisMonth,
(
), 0) AS countDriverThisMonth,
COALESCE((
SELECT
COUNT(`id`)
FROM
`CarRegistration`
WHERE
`CarRegistration`.`created_at` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
) AS countCarRegistrationThisMonth,
(
), 0) AS countCarRegistrationThisMonth,
COALESCE((
SELECT
COUNT(`id`)
FROM
`complaint`
WHERE
`complaint`.`date_filed` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
) AS countComplaintThisMonth,
(
), 0) AS countComplaintThisMonth,
COALESCE((
SELECT
COUNT(`id`)
FROM
@@ -105,30 +104,26 @@ WHERE
),
'%Y-%m-%d'
)
) AS countComplaintThisWeek,
(
), 0) AS countComplaintThisWeek,
COALESCE((
SELECT
COUNT(`id`)
FROM
`complaint`
WHERE
`complaint`.`date_filed` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-%d') AND DATE_FORMAT(CURRENT_DATE, '%Y-%m-%d')
) AS countComplaintToday,
(
), 0) AS countComplaintToday,
COALESCE((
SELECT
SUM(`payments`.`amount`)
FROM
`payments` WHERE
`payments`
WHERE
`payments`.`created_at` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
AND
`payments`.`payment_method` IN('visa-in',
'visa',
'visaRide',
'TransferFrom',
'payout',
'TransferTo')
) AS payments,
(
`payments`.`payment_method` IN('visa-in', 'visa', 'visaRide', 'TransferFrom', 'payout', 'TransferTo')
), 0) AS payments,
COALESCE((
SELECT
SUM(`driverWallet`.`amount`)
FROM
@@ -137,15 +132,23 @@ WHERE
`driverWallet`.`dateCreated` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
AND
`driverWallet`.`paymentMethod` IN('visa', '')
) AS driverWallet,
(
), 0) AS driverWallet,
COALESCE((
SELECT
SUM(`passengerWallet`.`balance`)
FROM
`passengerWallet`
WHERE
`passengerWallet`.`created_at` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
) AS passengerWallet
), 0) AS passengerWallet,
COALESCE((
SELECT
SUM(`seferWallet`.`amount`)
FROM
`seferWallet`
WHERE
`seferWallet`.`createdAt` BETWEEN DATE_FORMAT(CURRENT_DATE, '%Y-%m-01') AND LAST_DAY(CURRENT_DATE)
), 0) AS seferWallet
FROM
`passengers`
LIMIT 1
LIMIT 1;

21
lib/views/Rate/rate_passenger.dart
View File

@@ -21,7 +21,8 @@ class RatePassenger extends StatelessWidget {
return MyScafolld(
title: 'Rate Passenger'.tr,
body: [
Positioned(
GetBuilder<RateController>(builder: (controller) {
return Positioned(
top: 40,
left: Get.width * .1,
right: Get.width * .1,
@@ -75,7 +76,8 @@ class RatePassenger extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(4),
child: Text(
Get.find<MapDriverController>().paymentAmount,
Get.find<MapDriverController>()
.paymentAmount,
style: AppStyle.number,
),
),
@@ -94,8 +96,7 @@ class RatePassenger extends StatelessWidget {
)),
),
controller.walletChecked != 'true'
? GetBuilder<RateController>(builder: (controller) {
return controller.ispassengerWantWalletFromDriver
? controller.ispassengerWantWalletFromDriver
? Container(
decoration: AppStyle.boxDecoration1,
child: Padding(
@@ -111,8 +112,7 @@ class RatePassenger extends StatelessWidget {
child: MyTextForm(
controller:
controller.passengerPayAmount,
label:
"passenger amount to me".tr,
label: "passenger amount to me".tr,
hint: "passenger amount to me".tr,
type: const TextInputType
.numberWithOptions(
@@ -145,8 +145,7 @@ class RatePassenger extends StatelessWidget {
})
],
),
);
})
)
: const SizedBox(),
const SizedBox(
height: 20,
@@ -224,7 +223,8 @@ class RatePassenger extends StatelessWidget {
const OutlineInputBorder(), // Add a border around the input field
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors.blue), // Customize the border color
color:
Colors.blue), // Customize the border color
),
focusedBorder: const OutlineInputBorder(
borderSide: BorderSide(
@@ -247,7 +247,8 @@ class RatePassenger extends StatelessWidget {
onPressed: () => controller.addRateToPassenger())
],
),
)),
));
}),
],
isleading: false,
);

6
lib/views/home/my_wallet/points_captain.dart
View File

@@ -48,8 +48,8 @@ class PointsCaptain extends StatelessWidget {
box.read(BoxName.countryCode) == 'Egypt'
? 'EGP'
: 'JOD', () async {
// await captainWalletController.addDriverPaymentPoints(
// 'visa-in', pricePoint);
await captainWalletController.addDriverPaymentPoints(
'visa-in', pricePoint);
await captainWalletController.addDriverWallet(
'visa-in', countPoint);
await captainWalletController.addSeferWallet(
@@ -75,6 +75,8 @@ class PointsCaptain extends StatelessWidget {
'visa-in', pricePoint);
await captainWalletController.addDriverWallet(
'visa-in', countPoint);
await captainWalletController.addSeferWallet(
'visa-in', pricePoint);
await captainWalletController
.getCaptainWalletFromBuyPoints();
});