Abdusalom999/Fondex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BASE: Switch From EasyLocalization To GetX Localization.

Browse Source
This commit is contained in:
Abdusalom G'ayratov
2025-12-04 16:56:39 +05:00
parent 157545f1c0
commit bf1d07a048
218 changed files with 2535 additions and 2313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
assets/translations/en-US.json → assets/translations/en.json
View File

0
assets/translations/ru-RU.json → assets/translations/ru.json
View File

0
assets/translations/uz-UZ.json → assets/translations/uz.json
View File

2
lib/constant/constant.dart
View File

@@ -19,7 +19,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:geolocator/geolocator.dart' as geolocator; import 'package:geolocator/geolocator.dart' as geolocator;
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:mailer/mailer.dart'; import 'package:mailer/mailer.dart';

81
lib/controllers/0n_demand_payment_controller.dart
View File

@@ -1,7 +1,8 @@
import 'dart:convert'; import 'dart:convert';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:get/get.dart' hide Trans;
import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import '../../models/onprovider_order_model.dart'; import '../../models/onprovider_order_model.dart';
import '../models/wallet_transaction_model.dart'; import '../models/wallet_transaction_model.dart';
@@ -75,7 +76,7 @@ class OnDemandPaymentController extends GetxController {
Future<void> placeOrder() async { Future<void> placeOrder() async {
if (!isExtra) { if (!isExtra) {
// Normal Order // Normal Order
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
onDemandOrderModel.value?.payment_method = selectedPaymentMethod.value; onDemandOrderModel.value?.payment_method = selectedPaymentMethod.value;
onDemandOrderModel.value?.paymentStatus = onDemandOrderModel.value?.paymentStatus =
@@ -111,7 +112,7 @@ class OnDemandPaymentController extends GetxController {
); );
} }
ShowToastDialog.showToast("OnDemand Service successfully booked".tr()); ShowToastDialog.showToast("OnDemand Service successfully booked".tr);
} }
if (selectedPaymentMethod.value == PaymentGateway.wallet.name) { if (selectedPaymentMethod.value == PaymentGateway.wallet.name) {
WalletTransactionModel transactionModel = WalletTransactionModel( WalletTransactionModel transactionModel = WalletTransactionModel(
@@ -123,8 +124,8 @@ class OnDemandPaymentController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
isTopup: false, isTopup: false,
orderId: onDemandOrderModel.value!.id, orderId: onDemandOrderModel.value!.id,
note: "Booking Amount debited".tr(), note: "Booking Amount debited".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
); );
await FireStoreUtils.setWalletTransaction(transactionModel).then(( await FireStoreUtils.setWalletTransaction(transactionModel).then((
@@ -161,7 +162,7 @@ class OnDemandPaymentController extends GetxController {
isTopup: false, isTopup: false,
orderId: onDemandOrderModel.value!.id, orderId: onDemandOrderModel.value!.id,
note: "Booking Extra charge debited", note: "Booking Extra charge debited",
paymentStatus: "success".tr(), paymentStatus: "success".tr,
); );
await FireStoreUtils.setWalletTransaction(transactionModel).then(( await FireStoreUtils.setWalletTransaction(transactionModel).then((
@@ -189,7 +190,7 @@ class OnDemandPaymentController extends GetxController {
isTopup: true, isTopup: true,
orderId: onDemandOrderModel.value?.id, orderId: onDemandOrderModel.value?.id,
note: 'Extra Charge Amount Credited', note: 'Extra Charge Amount Credited',
paymentStatus: "success".tr(), paymentStatus: "success".tr,
); );
await FireStoreUtils.setWalletTransaction(transactionModel).then(( await FireStoreUtils.setWalletTransaction(transactionModel).then((
@@ -321,7 +322,7 @@ class OnDemandPaymentController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -354,7 +355,7 @@ class OnDemandPaymentController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -437,10 +438,10 @@ class OnDemandPaymentController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -472,15 +473,15 @@ class OnDemandPaymentController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
placeOrder(); placeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -507,15 +508,15 @@ class OnDemandPaymentController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -557,10 +558,10 @@ class OnDemandPaymentController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -594,11 +595,11 @@ class OnDemandPaymentController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -743,7 +744,7 @@ class OnDemandPaymentController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -780,18 +781,18 @@ class OnDemandPaymentController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -809,10 +810,10 @@ class OnDemandPaymentController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -853,7 +854,7 @@ class OnDemandPaymentController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -901,12 +902,12 @@ class OnDemandPaymentController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -934,7 +935,7 @@ class OnDemandPaymentController extends GetxController {
accessToken = responseData['access_token'] ?? ''; accessToken = responseData['access_token'] ?? '';
if (accessToken.isEmpty) { if (accessToken.isEmpty) {
ShowToastDialog.showToast("Failed to get access token".tr()); ShowToastDialog.showToast("Failed to get access token".tr);
return ''; return '';
} }
@@ -946,7 +947,7 @@ class OnDemandPaymentController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1001,7 +1002,7 @@ class OnDemandPaymentController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1029,13 +1030,13 @@ class OnDemandPaymentController extends GetxController {
// () => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken), // () => OrangeMoneyScreen(initialURl: paymentURL, accessToken: accessToken, amount: amount, orangePay: orangeMoneyModel.value, orderId: orderId, payToken: payToken),
// )!.then((value) { // )!.then((value) {
// if (value == true) { // if (value == true) {
// ShowToastDialog.showToast("Payment Successful!!".tr()); // ShowToastDialog.showToast("Payment Successful!!".tr);
// placeOrder(); // placeOrder();
// (); // ();
// } // }
// }); // });
// } else { // } else {
// ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); // ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
// } // }
// } // }
// //
@@ -1058,7 +1059,7 @@ class OnDemandPaymentController extends GetxController {
// // ignore: use_build_context_synchronously // // ignore: use_build_context_synchronously
// return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId); // return await webpayment(context: context, amountData: amount, currency: currency, orderIdData: orderId);
// } else { // } else {
// ShowToastDialog.showToast("Something went wrong, please contact admin.".tr()); // ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
// return ''; // return '';
// } // }
// } // }
@@ -1099,7 +1100,7 @@ class OnDemandPaymentController extends GetxController {
// return ''; // return '';
// } // }
// } else { // } else {
// ShowToastDialog.showToast("Something went wrong, please contact admin.".tr()); // ShowToastDialog.showToast("Something went wrong, please contact admin.".tr);
// return ''; // return '';
// } // }
// } // }
@@ -1124,11 +1125,11 @@ class OnDemandPaymentController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

76
lib/controllers/Intercity_home_controller.dart
View File

@@ -42,13 +42,13 @@ import 'package:customer/payment/xenditScreen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_map/flutter_map.dart' as flutterMap;
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:latlong2/latlong.dart' as latlong; import 'package:latlong2/latlong.dart' as latlong;
@@ -402,7 +402,7 @@ class IntercityHomeController extends GetxController {
Marker( Marker(
markerId: const MarkerId("pickup"), markerId: const MarkerId("pickup"),
position: LatLng(pickupLat, pickupLng), position: LatLng(pickupLat, pickupLng),
infoWindow: InfoWindow(title: "Pickup Location".tr()), infoWindow: InfoWindow(title: "Pickup Location".tr),
icon: icon:
departureIcon ?? departureIcon ??
BitmapDescriptor.defaultMarkerWithHue( BitmapDescriptor.defaultMarkerWithHue(
@@ -412,7 +412,7 @@ class IntercityHomeController extends GetxController {
Marker( Marker(
markerId: const MarkerId("driver"), markerId: const MarkerId("driver"),
position: LatLng(driverLat, driverLng), position: LatLng(driverLat, driverLng),
infoWindow: InfoWindow(title: "Driver at Pickup".tr()), infoWindow: InfoWindow(title: "Driver at Pickup".tr),
icon: taxiIcon ?? BitmapDescriptor.defaultMarker, icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
), ),
]); ]);
@@ -421,7 +421,7 @@ class IntercityHomeController extends GetxController {
Marker( Marker(
markerId: const MarkerId("destination"), markerId: const MarkerId("destination"),
position: LatLng(destLat, destLng), position: LatLng(destLat, destLng),
infoWindow: InfoWindow(title: "Destination Location".tr()), infoWindow: InfoWindow(title: "Destination Location".tr),
icon: icon:
destinationIcon ?? destinationIcon ??
BitmapDescriptor.defaultMarkerWithHue( BitmapDescriptor.defaultMarkerWithHue(
@@ -431,7 +431,7 @@ class IntercityHomeController extends GetxController {
Marker( Marker(
markerId: const MarkerId("driver"), markerId: const MarkerId("driver"),
position: LatLng(driverLat, driverLng), position: LatLng(driverLat, driverLng),
infoWindow: InfoWindow(title: "Driver Location".tr()), infoWindow: InfoWindow(title: "Driver Location".tr),
icon: taxiIcon ?? BitmapDescriptor.defaultMarker, icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
), ),
]); ]);
@@ -536,7 +536,7 @@ class IntercityHomeController extends GetxController {
if (selectedPaymentMethod.value == PaymentGateway.cod.name) { if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
currentOrder.value.paymentMethod = selectedPaymentMethod.value; currentOrder.value.paymentMethod = selectedPaymentMethod.value;
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
ShowToastDialog.showToast("Payment method changed".tr()); ShowToastDialog.showToast("Payment method changed".tr);
Get.back(); Get.back();
Get.back(); Get.back();
}); });
@@ -557,8 +557,8 @@ class IntercityHomeController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
isTopup: false, isTopup: false,
orderId: currentOrder.value.id, orderId: currentOrder.value.id,
note: "Cab Amount debited".tr(), note: "Cab Amount debited".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
serviceType: Constant.parcelServiceType, serviceType: Constant.parcelServiceType,
); );
@@ -575,7 +575,7 @@ class IntercityHomeController extends GetxController {
} }
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
Get.back(); Get.back();
}); });
} }
@@ -743,7 +743,7 @@ class IntercityHomeController extends GetxController {
final LatLng pos = LatLng(lat, lng); final LatLng pos = LatLng(lat, lng);
final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination'); final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination');
final icon = isDeparture ? departureIcon! : destinationIcon!; final icon = isDeparture ? departureIcon! : destinationIcon!;
final title = isDeparture ? 'Departure'.tr() : 'Destination'.tr(); final title = isDeparture ? 'Departure'.tr : 'Destination'.tr;
if (isDeparture) { if (isDeparture) {
departureLatLong.value = pos; departureLatLong.value = pos;
@@ -1371,7 +1371,7 @@ class IntercityHomeController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -1404,7 +1404,7 @@ class IntercityHomeController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -1487,10 +1487,10 @@ class IntercityHomeController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -1522,15 +1522,15 @@ class IntercityHomeController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
completeOrder(); completeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -1557,15 +1557,15 @@ class IntercityHomeController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -1607,10 +1607,10 @@ class IntercityHomeController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -1644,11 +1644,11 @@ class IntercityHomeController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -1776,7 +1776,7 @@ class IntercityHomeController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -1813,18 +1813,18 @@ class IntercityHomeController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -1842,10 +1842,10 @@ class IntercityHomeController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -1886,7 +1886,7 @@ class IntercityHomeController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1929,13 +1929,13 @@ class IntercityHomeController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -1973,7 +1973,7 @@ class IntercityHomeController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -2024,7 +2024,7 @@ class IntercityHomeController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -2050,11 +2050,11 @@ class IntercityHomeController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

2
lib/controllers/address_list_controller.dart
View File

@@ -1,5 +1,5 @@
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

2
lib/controllers/advertisement_list_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/models/advertisement_model.dart';
import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/favourite_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class AdvertisementListController extends GetxController { class AdvertisementListController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/all_brand_product_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/models/brands_model.dart';
import 'package:customer/models/product_model.dart'; import 'package:customer/models/product_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class AllBrandProductController extends GetxController { class AllBrandProductController extends GetxController {
RxList<ProductModel> productList = <ProductModel>[].obs; RxList<ProductModel> productList = <ProductModel>[].obs;

2
lib/controllers/all_category_product_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:customer/models/product_model.dart'; import 'package:customer/models/product_model.dart';
import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/models/vendor_category_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class AllCategoryProductController extends GetxController { class AllCategoryProductController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

36
lib/controllers/book_parcel_controller.dart
View File

@@ -3,12 +3,12 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart'; import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart';
import 'package:dropdown_textfield/dropdown_textfield.dart'; import 'package:dropdown_textfield/dropdown_textfield.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geocoding/geocoding.dart'; import 'package:geocoding/geocoding.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong; import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong;
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
@@ -124,12 +124,12 @@ class BookParcelController extends GetxController {
void onCameraClick(BuildContext context) { void onCameraClick(BuildContext context) {
final action = CupertinoActionSheet( final action = CupertinoActionSheet(
message: Text( message: Text(
'Add your parcel image.'.tr(), 'Add your parcel image.'.tr,
style: const TextStyle(fontSize: 15.0), style: const TextStyle(fontSize: 15.0),
), ),
actions: <Widget>[ actions: <Widget>[
CupertinoActionSheetAction( CupertinoActionSheetAction(
child: Text('Choose image from gallery'.tr()), child: Text('Choose image from gallery'.tr),
onPressed: () async { onPressed: () async {
Navigator.pop(context); Navigator.pop(context);
final imageList = await _picker.pickMultiImage(); final imageList = await _picker.pickMultiImage();
@@ -139,7 +139,7 @@ class BookParcelController extends GetxController {
}, },
), ),
CupertinoActionSheetAction( CupertinoActionSheetAction(
child: Text('Take a picture'.tr()), child: Text('Take a picture'.tr),
onPressed: () async { onPressed: () async {
Navigator.pop(context); Navigator.pop(context);
final XFile? photo = await _picker.pickImage( final XFile? photo = await _picker.pickImage(
@@ -152,7 +152,7 @@ class BookParcelController extends GetxController {
), ),
], ],
cancelButton: CupertinoActionSheetAction( cancelButton: CupertinoActionSheetAction(
child: Text('Cancel'.tr()), child: Text('Cancel'.tr),
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),
), ),
); );
@@ -184,39 +184,39 @@ class BookParcelController extends GetxController {
bool validateFields() { bool validateFields() {
if (senderNameController.value.text.isEmpty) { if (senderNameController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter sender name".tr()); ShowToastDialog.showToast("Please enter sender name".tr);
return false; return false;
} else if (senderMobileController.value.text.isEmpty) { } else if (senderMobileController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter sender mobile".tr()); ShowToastDialog.showToast("Please enter sender mobile".tr);
return false; return false;
} else if (senderLocationController.value.text.isEmpty) { } else if (senderLocationController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter sender address".tr()); ShowToastDialog.showToast("Please enter sender address".tr);
return false; return false;
} else if (receiverNameController.value.text.isEmpty) { } else if (receiverNameController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter receiver name".tr()); ShowToastDialog.showToast("Please enter receiver name".tr);
return false; return false;
} else if (receiverMobileController.value.text.isEmpty) { } else if (receiverMobileController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter receiver mobile".tr()); ShowToastDialog.showToast("Please enter receiver mobile".tr);
return false; return false;
} else if (receiverLocationController.value.text.isEmpty) { } else if (receiverLocationController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter receiver address".tr()); ShowToastDialog.showToast("Please enter receiver address".tr);
return false; return false;
} else if (isScheduled.value) { } else if (isScheduled.value) {
if (scheduledDate.value.isEmpty) { if (scheduledDate.value.isEmpty) {
ShowToastDialog.showToast("Please select scheduled date".tr()); ShowToastDialog.showToast("Please select scheduled date".tr);
return false; return false;
} else if (scheduledTime.value.isEmpty) { } else if (scheduledTime.value.isEmpty) {
ShowToastDialog.showToast("Please select scheduled time".tr()); ShowToastDialog.showToast("Please select scheduled time".tr);
return false; return false;
} }
} }
if (selectedWeight == null) { if (selectedWeight == null) {
ShowToastDialog.showToast("Please select parcel weight".tr()); ShowToastDialog.showToast("Please select parcel weight".tr);
return false; return false;
} else if (senderLocation.value == null || receiverLocation.value == null) { } else if (senderLocation.value == null || receiverLocation.value == null) {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Please select both sender and receiver locations".tr(), "Please select both sender and receiver locations".tr,
); );
return false; return false;
} }
@@ -254,7 +254,7 @@ class BookParcelController extends GetxController {
if (distance.value < 0.5) { if (distance.value < 0.5) {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Sender's location to receiver's location should be more than 1 km." "Sender's location to receiver's location should be more than 1 km."
.tr(), .tr,
); );
return; return;
} }
@@ -264,7 +264,7 @@ class BookParcelController extends GetxController {
double.parse(selectedWeight!.deliveryCharge.toString())); double.parse(selectedWeight!.deliveryCharge.toString()));
goToCart(); goToCart();
} catch (e) { } catch (e) {
ShowToastDialog.showToast("Something went wrong while booking.".tr()); ShowToastDialog.showToast("Something went wrong while booking.".tr);
debugPrint("bookNow error: $e"); debugPrint("bookNow error: $e");
} }
} }

74
lib/controllers/cab_booking_controller.dart
View File

@@ -40,13 +40,13 @@ import 'package:customer/payment/xenditScreen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_map/flutter_map.dart' as flutterMap;
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:latlong2/latlong.dart' as latlong; import 'package:latlong2/latlong.dart' as latlong;
@@ -393,7 +393,7 @@ class CabBookingController extends GetxController {
Marker( Marker(
markerId: const MarkerId("pickup"), markerId: const MarkerId("pickup"),
position: LatLng(pickupLat, pickupLng), position: LatLng(pickupLat, pickupLng),
infoWindow: InfoWindow(title: "Pickup Location".tr()), infoWindow: InfoWindow(title: "Pickup Location".tr),
icon: icon:
departureIcon ?? departureIcon ??
BitmapDescriptor.defaultMarkerWithHue( BitmapDescriptor.defaultMarkerWithHue(
@@ -403,7 +403,7 @@ class CabBookingController extends GetxController {
Marker( Marker(
markerId: const MarkerId("driver"), markerId: const MarkerId("driver"),
position: LatLng(driverLat, driverLng), position: LatLng(driverLat, driverLng),
infoWindow: InfoWindow(title: "Driver at Pickup".tr()), infoWindow: InfoWindow(title: "Driver at Pickup".tr),
icon: taxiIcon ?? BitmapDescriptor.defaultMarker, icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
), ),
]); ]);
@@ -412,7 +412,7 @@ class CabBookingController extends GetxController {
Marker( Marker(
markerId: const MarkerId("destination"), markerId: const MarkerId("destination"),
position: LatLng(destLat, destLng), position: LatLng(destLat, destLng),
infoWindow: InfoWindow(title: "Destination Location".tr()), infoWindow: InfoWindow(title: "Destination Location".tr),
icon: icon:
destinationIcon ?? destinationIcon ??
BitmapDescriptor.defaultMarkerWithHue( BitmapDescriptor.defaultMarkerWithHue(
@@ -422,7 +422,7 @@ class CabBookingController extends GetxController {
Marker( Marker(
markerId: const MarkerId("driver"), markerId: const MarkerId("driver"),
position: LatLng(driverLat, driverLng), position: LatLng(driverLat, driverLng),
infoWindow: InfoWindow(title: "Driver Location".tr()), infoWindow: InfoWindow(title: "Driver Location".tr),
icon: taxiIcon ?? BitmapDescriptor.defaultMarker, icon: taxiIcon ?? BitmapDescriptor.defaultMarker,
), ),
]); ]);
@@ -527,7 +527,7 @@ class CabBookingController extends GetxController {
if (selectedPaymentMethod.value == PaymentGateway.cod.name) { if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
currentOrder.value.paymentMethod = selectedPaymentMethod.value; currentOrder.value.paymentMethod = selectedPaymentMethod.value;
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
ShowToastDialog.showToast("Payment method changed".tr()); ShowToastDialog.showToast("Payment method changed".tr);
Get.back(); Get.back();
Get.back(); Get.back();
}); });
@@ -566,7 +566,7 @@ class CabBookingController extends GetxController {
} }
await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) { await FireStoreUtils.cabOrderPlace(currentOrder.value).then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
Get.back(); Get.back();
}); });
} }
@@ -699,7 +699,7 @@ class CabBookingController extends GetxController {
Marker( Marker(
markerId: markerId, markerId: markerId,
infoWindow: InfoWindow( infoWindow: InfoWindow(
title: '${'Stop'.tr()} ${String.fromCharCode(index + 65)}', title: '${'Stop'.tr} ${String.fromCharCode(index + 65)}',
), ),
position: LatLng(lat, lng), position: LatLng(lat, lng),
icon: stopIcon!, icon: stopIcon!,
@@ -734,7 +734,7 @@ class CabBookingController extends GetxController {
final LatLng pos = LatLng(lat, lng); final LatLng pos = LatLng(lat, lng);
final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination'); final markerId = MarkerId(isDeparture ? 'Departure' : 'Destination');
final icon = isDeparture ? departureIcon! : destinationIcon!; final icon = isDeparture ? departureIcon! : destinationIcon!;
final title = isDeparture ? 'Departure'.tr() : 'Destination'.tr(); final title = isDeparture ? 'Departure'.tr : 'Destination'.tr;
if (isDeparture) { if (isDeparture) {
departureLatLong.value = pos; departureLatLong.value = pos;
@@ -1362,7 +1362,7 @@ class CabBookingController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -1395,7 +1395,7 @@ class CabBookingController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -1478,10 +1478,10 @@ class CabBookingController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -1513,15 +1513,15 @@ class CabBookingController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
completeOrder(); completeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -1548,15 +1548,15 @@ class CabBookingController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -1598,10 +1598,10 @@ class CabBookingController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -1635,11 +1635,11 @@ class CabBookingController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -1767,7 +1767,7 @@ class CabBookingController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -1804,18 +1804,18 @@ class CabBookingController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -1833,10 +1833,10 @@ class CabBookingController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -1877,7 +1877,7 @@ class CabBookingController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1920,13 +1920,13 @@ class CabBookingController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -1964,7 +1964,7 @@ class CabBookingController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -2015,7 +2015,7 @@ class CabBookingController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -2041,11 +2041,11 @@ class CabBookingController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

2
lib/controllers/cab_coupon_code_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class CabCouponCodeController extends GetxController { class CabCouponCodeController extends GetxController {
// Add your methods and properties here // Add your methods and properties here

2
lib/controllers/cab_dashboard_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/screen_ui/cab_service_screens/cab_home_screen.dart';
import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_screen.dart';
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/cab_service_screens/my_cab_booking_screen.dart'; import '../screen_ui/cab_service_screens/my_cab_booking_screen.dart';
class CabDashboardController extends GetxController { class CabDashboardController extends GetxController {

2
lib/controllers/cab_home_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/banner_model.dart'; import 'package:customer/models/banner_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class CabHomeController extends GetxController { class CabHomeController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/cab_order_details_controller.dart
View File

@@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/rating_model.dart'; import 'package:customer/models/rating_model.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:google_maps_flutter/google_maps_flutter.dart' as gmap; import 'package:google_maps_flutter/google_maps_flutter.dart' as gmap;
import 'package:latlong2/latlong.dart' as osm; import 'package:latlong2/latlong.dart' as osm;

2
lib/controllers/cab_rental_dashboard_controllers.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import 'package:customer/screen_ui/rental_service/rental_home_screen.dart'; import 'package:customer/screen_ui/rental_service/rental_home_screen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/rental_service/my_rental_booking_screen.dart'; import '../screen_ui/rental_service/my_rental_booking_screen.dart';
class CabRentalDashboardControllers extends GetxController { class CabRentalDashboardControllers extends GetxController {

8
lib/controllers/cab_review_controller.dart
View File

@@ -1,8 +1,8 @@
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/cab_order_model.dart'; import 'package:customer/models/cab_order_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/collection_name.dart'; import '../constant/collection_name.dart';
import '../models/rating_model.dart'; import '../models/rating_model.dart';
import '../models/user_model.dart'; import '../models/user_model.dart';
@@ -73,11 +73,11 @@ class CabReviewController extends GetxController {
/// Save / update review /// Save / update review
Future<void> submitReview() async { Future<void> submitReview() async {
if (comment.value.text.trim().isEmpty || ratings.value == 0) { if (comment.value.text.trim().isEmpty || ratings.value == 0) {
ShowToastDialog.showToast("Please provide rating and comment".tr()); ShowToastDialog.showToast("Please provide rating and comment".tr);
return; return;
} }
ShowToastDialog.showLoader("Submit in...".tr()); ShowToastDialog.showLoader("Submit in...".tr);
final user = await FireStoreUtils.getUserProfile( final user = await FireStoreUtils.getUserProfile(
order.value?.driverId ?? '', order.value?.driverId ?? '',

68
lib/controllers/cart_controller.dart
View File

@@ -13,11 +13,11 @@ import 'package:customer/models/user_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/app_them_data.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:razorpay_flutter/razorpay_flutter.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart';
@@ -416,7 +416,7 @@ class CartController extends GetxController {
setOrder(); setOrder();
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"You don't have sufficient wallet balance to place order".tr(), "You don't have sufficient wallet balance to place order".tr,
); );
} }
} else { } else {
@@ -425,7 +425,7 @@ class CartController extends GetxController {
} }
Future<void> setOrder() async { Future<void> setOrder() async {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
if ((Constant.isSubscriptionModelApplied == true || if ((Constant.isSubscriptionModelApplied == true ||
Constant.sectionConstantModel?.adminCommision?.isEnabled == true) && Constant.sectionConstantModel?.adminCommision?.isEnabled == true) &&
@@ -438,7 +438,7 @@ class CartController extends GetxController {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This vendor has reached their maximum order capacity. Please select a different vendor or try again later." "This vendor has reached their maximum order capacity. Please select a different vendor or try again later."
.tr(), .tr,
); );
return; return;
} }
@@ -508,8 +508,8 @@ class CartController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
isTopup: false, isTopup: false,
orderId: orderModel.id, orderId: orderModel.id,
note: "Order Amount debited".tr(), note: "Order Amount debited".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
); );
await FireStoreUtils.setWalletTransaction(transactionModel).then(( await FireStoreUtils.setWalletTransaction(transactionModel).then((
@@ -712,7 +712,7 @@ class CartController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -745,7 +745,7 @@ class CartController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -828,10 +828,10 @@ class CartController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -863,15 +863,15 @@ class CartController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
placeOrder(); placeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -898,15 +898,15 @@ class CartController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -948,10 +948,10 @@ class CartController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -985,11 +985,11 @@ class CartController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -1134,7 +1134,7 @@ class CartController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -1170,18 +1170,18 @@ class CartController extends GetxController {
} }
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -1199,10 +1199,10 @@ class CartController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -1243,7 +1243,7 @@ class CartController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1286,13 +1286,13 @@ class CartController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
(); ();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -1330,7 +1330,7 @@ class CartController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1381,7 +1381,7 @@ class CartController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1407,11 +1407,11 @@ class CartController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

2
lib/controllers/cashback_controller.dart
View File

@@ -1,5 +1,5 @@
import '../models/cashback_model.dart'; import '../models/cashback_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
class CashbackController extends GetxController { class CashbackController extends GetxController {

2
lib/controllers/category_restaurant_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/models/vendor_model.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import '../models/vendor_category_model.dart'; import '../models/vendor_category_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class CategoryRestaurantController extends GetxController { class CategoryRestaurantController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/change_language_controller.dart
View File

@@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/models/language_model.dart'; import 'package:customer/models/language_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/collection_name.dart'; import '../constant/collection_name.dart';
class ChangeLanguageController extends GetxController { class ChangeLanguageController extends GetxController {

12
lib/controllers/chat_controller.dart
View File

@@ -1,13 +1,13 @@
import 'dart:async'; import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import '../models/conversation_model.dart'; import '../models/conversation_model.dart';
import '../models/inbox_model.dart'; import '../models/inbox_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
import '../service/send_notification.dart'; import '../service/send_notification.dart';
@@ -104,11 +104,11 @@ class ChatController extends GetxController {
if (url != null) { if (url != null) {
if (url.mime.contains('image')) { if (url.mime.contains('image')) {
conversationModel.message = "sent a message".tr(); conversationModel.message = "sent a message".tr;
} else if (url.mime.contains('video')) { } else if (url.mime.contains('video')) {
conversationModel.message = "Sent a video".tr(); conversationModel.message = "Sent a video".tr;
} else if (url.mime.contains('audio')) { } else if (url.mime.contains('audio')) {
conversationModel.message = "Sent a audio".tr(); conversationModel.message = "Sent a audio".tr;
} }
} }
@@ -152,7 +152,7 @@ class ChatController extends GetxController {
// sendMessage('', url, '', 'image'); // sendMessage('', url, '', 'image');
// Get.back(); // Get.back();
// } on PlatformException catch (e) { // } on PlatformException catch (e) {
// ShowToastDialog.showToast("${"failed_to_pick".tr()} : \n $e"); // ShowToastDialog.showToast("${"failed_to_pick".tr} : \n $e");
// } // }
// } // }
} }

17
lib/controllers/complain_controller.dart
View File

@@ -1,6 +1,5 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/cab_order_model.dart'; import '../models/cab_order_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import '../themes/show_toast_dialog.dart'; import '../themes/show_toast_dialog.dart';
@@ -22,7 +21,7 @@ class ComplainController extends GetxController {
order.value = args['order'] as CabOrderModel; order.value = args['order'] as CabOrderModel;
getComplain(); getComplain();
} else { } else {
ShowToastDialog.showToast("Order data not found".tr()); ShowToastDialog.showToast("Order data not found".tr);
Get.back(); Get.back();
} }
} }
@@ -38,7 +37,7 @@ class ComplainController extends GetxController {
comment.value.text = data['description'] ?? ''; comment.value.text = data['description'] ?? '';
} }
} catch (e) { } catch (e) {
ShowToastDialog.showToast("Failed to load complaint".tr()); ShowToastDialog.showToast("Failed to load complaint".tr);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }
@@ -47,12 +46,12 @@ class ComplainController extends GetxController {
Future<void> submitComplain() async { Future<void> submitComplain() async {
// Validation // Validation
if (title.value.text.trim().isEmpty) { if (title.value.text.trim().isEmpty) {
ShowToastDialog.showToast("Please enter complaint title".tr()); ShowToastDialog.showToast("Please enter complaint title".tr);
return; return;
} }
if (comment.value.text.trim().isEmpty) { if (comment.value.text.trim().isEmpty) {
ShowToastDialog.showToast("Please enter complaint description".tr()); ShowToastDialog.showToast("Please enter complaint description".tr);
return; return;
} }
@@ -82,16 +81,16 @@ class ComplainController extends GetxController {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Your complaint has been submitted to admin".tr(), "Your complaint has been submitted to admin".tr,
); );
Get.back(); Get.back();
} else { } else {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Your complaint is already submitted".tr()); ShowToastDialog.showToast("Your complaint is already submitted".tr);
} }
} catch (e) { } catch (e) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Something went wrong, please try again".tr()); ShowToastDialog.showToast("Something went wrong, please try again".tr);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }

2
lib/controllers/dash_board_controller.dart
View File

@@ -6,7 +6,7 @@ import '../screen_ui/multi_vendor_service/order_list_screen/order_screen.dart';
import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart'; import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart';
import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class DashBoardController extends GetxController { class DashBoardController extends GetxController {
RxInt selectedIndex = 0.obs; RxInt selectedIndex = 0.obs;

2
lib/controllers/dash_board_ecommarce_controller.dart
View File

@@ -5,7 +5,7 @@ import '../screen_ui/multi_vendor_service/order_list_screen/order_screen.dart';
import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart'; import '../screen_ui/multi_vendor_service/profile_screen/profile_screen.dart';
import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class DashBoardEcommerceController extends GetxController { class DashBoardEcommerceController extends GetxController {
RxInt selectedIndex = 0.obs; RxInt selectedIndex = 0.obs;

2
lib/controllers/dine_in_booking_controller.dart
View File

@@ -1,6 +1,6 @@
import '../models/dine_in_booking_model.dart'; import '../models/dine_in_booking_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class DineInBookingController extends GetxController { class DineInBookingController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/dine_in_booking_details_controller.dart
View File

@@ -1,5 +1,5 @@
import 'package:customer/models/dine_in_booking_model.dart'; import 'package:customer/models/dine_in_booking_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class DineInBookingDetailsController extends GetxController { class DineInBookingDetailsController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/dine_in_controller.dart
View File

@@ -7,7 +7,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
import '../models/banner_model.dart'; import '../models/banner_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class DineInController extends GetxController { class DineInController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

12
lib/controllers/dine_in_restaurant_details_controller.dart
View File

@@ -4,11 +4,11 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/models/dine_in_booking_model.dart'; import 'package:customer/models/dine_in_booking_model.dart';
import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/favourite_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:easy_localization/easy_localization.dart';
import '../screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart'; import '../screen_ui/multi_vendor_service/dine_in_booking/dine_in_booking_screen.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import '../service/send_notification.dart'; import '../service/send_notification.dart';
@@ -37,9 +37,9 @@ class DineInRestaurantDetailsController extends GetxController {
String getLocalizedOccasion(String key) { String getLocalizedOccasion(String key) {
switch (key) { switch (key) {
case "Birthday": case "Birthday":
return "Birthday".tr(); return "Birthday".tr;
case "Anniversary": case "Anniversary":
return "Anniversary".tr(); return "Anniversary".tr;
default: default:
return key; return key;
} }
@@ -65,7 +65,7 @@ class DineInRestaurantDetailsController extends GetxController {
} }
Future<void> orderBook() async { Future<void> orderBook() async {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
DateTime dt = selectedDate.value.toDate(); DateTime dt = selectedDate.value.toDate();
String hour = DateFormat("kk:mm").format( String hour = DateFormat("kk:mm").format(
@@ -118,7 +118,7 @@ class DineInRestaurantDetailsController extends GetxController {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
Get.back(); Get.back();
Get.to(const DineInBookingScreen()); Get.to(const DineInBookingScreen());
ShowToastDialog.showToast('Dine-In Request submitted successfully.'.tr()); ShowToastDialog.showToast('Dine-In Request submitted successfully.'.tr);
} }
void getRecord() { void getRecord() {

2
lib/controllers/discount_restaurant_list_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class DiscountRestaurantListController extends GetxController { class DiscountRestaurantListController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

8
lib/controllers/edit_profile_controller.dart
View File

@@ -1,11 +1,11 @@
import 'dart:io'; import 'dart:io';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:easy_localization/easy_localization.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import '../themes/show_toast_dialog.dart'; import '../themes/show_toast_dialog.dart';
@@ -48,7 +48,7 @@ class EditProfileController extends GetxController {
} }
Future<void> saveData() async { Future<void> saveData() async {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
if (Constant().hasValidUrl(profileImage.value) == false && if (Constant().hasValidUrl(profileImage.value) == false &&
profileImage.value.isNotEmpty) { profileImage.value.isNotEmpty) {
profileImage.value = await Constant.uploadUserImageToFireStorage( profileImage.value = await Constant.uploadUserImageToFireStorage(
@@ -78,7 +78,7 @@ class EditProfileController extends GetxController {
Get.back(); Get.back();
profileImage.value = image.path; profileImage.value = image.path;
} on PlatformException catch (e) { } on PlatformException catch (e) {
ShowToastDialog.showToast("${"failed_to_pick".tr()} : \n $e"); ShowToastDialog.showToast("${"failed_to_pick".tr} : \n $e");
} }
} }
} }

12
lib/controllers/enter_manually_location_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/user_model.dart'; import '../models/user_model.dart';
class EnterManuallyLocationController extends GetxController { class EnterManuallyLocationController extends GetxController {
@@ -76,13 +76,13 @@ class EnterManuallyLocationController extends GetxController {
String getLocalizedSaveAs(String key) { String getLocalizedSaveAs(String key) {
switch (key) { switch (key) {
case 'Home': case 'Home':
return 'Home'.tr(); return 'Home'.tr;
case 'Work': case 'Work':
return 'Work'.tr(); return 'Work'.tr;
case 'Hotel': case 'Hotel':
return 'Hotel'.tr(); return 'Hotel'.tr;
case 'Other': case 'Other':
return 'Other'.tr(); return 'Other'.tr;
default: default:
return key; return key;
} }

2
lib/controllers/favourite_controller.dart
View File

@@ -5,7 +5,7 @@ import 'package:customer/models/favourite_model.dart';
import 'package:customer/models/product_model.dart'; import 'package:customer/models/product_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class FavouriteController extends GetxController { class FavouriteController extends GetxController {
RxBool favouriteRestaurant = true.obs; RxBool favouriteRestaurant = true.obs;

2
lib/controllers/favourite_ondemmand_controller.dart
View File

@@ -4,7 +4,7 @@ import 'package:customer/models/favorite_ondemand_service_model.dart';
import 'package:customer/models/provider_serivce_model.dart'; import 'package:customer/models/provider_serivce_model.dart';
import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/screen_ui/auth_screens/login_screen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class FavouriteOndemmandController extends GetxController { class FavouriteOndemmandController extends GetxController {
// Add your controller logic here // Add your controller logic here

6
lib/controllers/food_home_controller.dart
View File

@@ -9,9 +9,9 @@ import 'package:customer/models/favourite_model.dart';
import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/models/vendor_category_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import '../models/banner_model.dart'; import '../models/banner_model.dart';
import '../models/story_model.dart'; import '../models/story_model.dart';
@@ -33,7 +33,7 @@ class FoodHomeController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;
RxBool isListView = true.obs; RxBool isListView = true.obs;
RxBool isPopular = true.obs; RxBool isPopular = true.obs;
RxString selectedOrderTypeValue = "Delivery".tr().obs; RxString selectedOrderTypeValue = "Delivery".tr.obs;
Rx<PageController> pageController = Rx<PageController> pageController =
PageController(viewportFraction: 0.877).obs; PageController(viewportFraction: 0.877).obs;

18
lib/controllers/forgot_password_controller.dart
View File

@@ -1,7 +1,6 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../themes/show_toast_dialog.dart'; import '../themes/show_toast_dialog.dart';
class ForgotPasswordController extends GetxController { class ForgotPasswordController extends GetxController {
@@ -12,32 +11,29 @@ class ForgotPasswordController extends GetxController {
final email = emailEditingController.value.text.trim(); final email = emailEditingController.value.text.trim();
if (email.isEmpty) { if (email.isEmpty) {
ShowToastDialog.showToast("Please enter your email address.".tr()); ShowToastDialog.showToast("Please enter your email address.".tr);
return; return;
} }
if (!GetUtils.isEmail(email)) { if (!GetUtils.isEmail(email)) {
ShowToastDialog.showToast("Please enter a valid email address.".tr()); ShowToastDialog.showToast("Please enter a valid email address.".tr);
return; return;
} }
try { try {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
await FirebaseAuth.instance.sendPasswordResetEmail(email: email); await FirebaseAuth.instance.sendPasswordResetEmail(email: email);
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast( ShowToastDialog.showToast(
'reset_password_link_sent'.tr(namedArgs: {'email': email}) 'reset_password_link_sent'.trParams({'email': email}),
); );
Get.back(); Get.back();
} on FirebaseAuthException catch (e) { } on FirebaseAuthException catch (e) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
if (e.code == 'user-not-found') { if (e.code == 'user-not-found') {
ShowToastDialog.showToast('No user found for that email.'.tr()); ShowToastDialog.showToast('No user found for that email.'.tr);
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(e.message?.tr ?? "something_went_wrong".tr);
e.message?.tr() ?? "something_went_wrong".tr(),
);
} }
} }
} }

66
lib/controllers/gift_card_controller.dart
View File

@@ -6,7 +6,7 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/gift_cards_model.dart'; import 'package:customer/models/gift_cards_model.dart';
import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/app_them_data.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:razorpay_flutter/razorpay_flutter.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart';
@@ -42,7 +42,7 @@ import '../screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@@ -99,7 +99,7 @@ class GiftCardController extends GetxController {
setOrder(); setOrder();
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"You don't have sufficient wallet balance to purchase gift card".tr(), "You don't have sufficient wallet balance to purchase gift card".tr,
); );
} }
} else { } else {
@@ -108,7 +108,7 @@ class GiftCardController extends GetxController {
} }
Future<void> setOrder() async { Future<void> setOrder() async {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
GiftCardsOrderModel giftCardsOrderModel = GiftCardsOrderModel(); GiftCardsOrderModel giftCardsOrderModel = GiftCardsOrderModel();
giftCardsOrderModel.id = const Uuid().v4(); giftCardsOrderModel.id = const Uuid().v4();
giftCardsOrderModel.giftId = selectedGiftCard.value.id.toString(); giftCardsOrderModel.giftId = selectedGiftCard.value.id.toString();
@@ -136,8 +136,8 @@ class GiftCardController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
isTopup: false, isTopup: false,
orderId: giftCardsOrderModel.id, orderId: giftCardsOrderModel.id,
note: "Gift card purchase amount debited".tr(), note: "Gift card purchase amount debited".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
); );
await FireStoreUtils.setWalletTransaction(transactionModel).then(( await FireStoreUtils.setWalletTransaction(transactionModel).then((
@@ -154,7 +154,7 @@ class GiftCardController extends GetxController {
await FireStoreUtils.placeGiftCardOrder(giftCardsOrderModel); await FireStoreUtils.placeGiftCardOrder(giftCardsOrderModel);
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
Get.off(const HistoryGiftCard()); Get.off(const HistoryGiftCard());
ShowToastDialog.showToast("Gift card Purchases successfully".tr()); ShowToastDialog.showToast("Gift card Purchases successfully".tr);
} }
String generateGiftCode() { String generateGiftCode() {
@@ -371,7 +371,7 @@ class GiftCardController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -454,10 +454,10 @@ class GiftCardController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -486,15 +486,15 @@ class GiftCardController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -536,10 +536,10 @@ class GiftCardController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -573,11 +573,11 @@ class GiftCardController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -605,15 +605,15 @@ class GiftCardController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
placeOrder(); placeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -759,7 +759,7 @@ class GiftCardController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -796,18 +796,18 @@ class GiftCardController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
//Midtrans payment //Midtrans payment
@@ -820,10 +820,10 @@ class GiftCardController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -864,7 +864,7 @@ class GiftCardController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -907,13 +907,13 @@ class GiftCardController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
(); ();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -951,7 +951,7 @@ class GiftCardController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1002,7 +1002,7 @@ class GiftCardController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1028,11 +1028,11 @@ class GiftCardController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

2
lib/controllers/global_setting_controller.dart
View File

@@ -4,7 +4,7 @@ import 'package:customer/models/currency_model.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:customer/utils/notification_service.dart'; import 'package:customer/utils/notification_service.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/collection_name.dart'; import '../constant/collection_name.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

6
lib/controllers/history_gift_card_controller.dart
View File

@@ -1,10 +1,10 @@
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/gift_cards_order_model.dart'; import 'package:customer/models/gift_cards_order_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:share_plus/share_plus.dart'; import 'package:share_plus/share_plus.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class HistoryGiftCardController extends GetxController { class HistoryGiftCardController extends GetxController {
RxList<GiftCardsOrderModel> giftCardsOrderList = <GiftCardsOrderModel>[].obs; RxList<GiftCardsOrderModel> giftCardsOrderList = <GiftCardsOrderModel>[].obs;
@@ -40,7 +40,7 @@ class HistoryGiftCardController extends GetxController {
Timestamp date, Timestamp date,
) async { ) async {
await Share.share( await Share.share(
"${'Gift Code :'.tr()} $giftCode\n${'Gift Pin :'.tr()} $giftPin\n${'Price :'.tr()} ${Constant.amountShow(amount: amount)}\n${'Expire Date :'.tr()} ${date.toDate()}\n\n${'Message'.tr()} : $msg", "${'Gift Code :'.tr} $giftCode\n${'Gift Pin :'.tr} $giftPin\n${'Price :'.tr} ${Constant.amountShow(amount: amount)}\n${'Expire Date :'.tr} ${date.toDate()}\n\n${'Message'.tr} : $msg",
); );
} }
} }

2
lib/controllers/home_e_commerce_controller.dart
View File

@@ -8,7 +8,7 @@ import 'package:customer/models/vendor_model.dart';
import 'package:customer/service/cart_provider.dart'; import 'package:customer/service/cart_provider.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
class HomeECommerceController extends GetxController { class HomeECommerceController extends GetxController {

2
lib/controllers/home_parcel_controller.dart
View File

@@ -1,6 +1,6 @@
import 'dart:developer'; import 'dart:developer';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/banner_model.dart'; import '../models/banner_model.dart';
import '../models/parcel_category.dart'; import '../models/parcel_category.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

2
lib/controllers/live_tracking_controller.dart
View File

@@ -6,7 +6,7 @@ import 'package:customer/models/order_model.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:latlong2/latlong.dart' as location; import 'package:latlong2/latlong.dart' as location;
import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_map/flutter_map.dart' as flutterMap;

59
lib/controllers/login_controller.dart
View File

@@ -1,9 +1,10 @@
import 'dart:convert'; import 'dart:convert';
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_sign_in/google_sign_in.dart'; import 'package:google_sign_in/google_sign_in.dart';
import 'package:sign_in_with_apple/sign_in_with_apple.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
@@ -33,18 +34,18 @@ class LoginController extends GetxController {
final email = emailController.value.text.trim(); final email = emailController.value.text.trim();
final password = passwordController.value.text.trim(); final password = passwordController.value.text.trim();
if (email.isEmpty || !email.contains('@')) { if (email.isEmpty || !email.contains('@')) {
ShowToastDialog.showToast("Please enter a valid email address".tr()); ShowToastDialog.showToast("Please enter a valid email address".tr);
return; return;
} }
if (password.isEmpty) { if (password.isEmpty) {
ShowToastDialog.showToast("Please enter your password".tr()); ShowToastDialog.showToast("Please enter your password".tr);
return; return;
} }
try { try {
isLoading.value = true; isLoading.value = true;
ShowToastDialog.showLoader("Logging in...".tr()); ShowToastDialog.showLoader("Logging in...".tr);
final credential = await FirebaseAuth.instance.signInWithEmailAndPassword( final credential = await FirebaseAuth.instance.signInWithEmailAndPassword(
email: email, email: email,
@@ -69,34 +70,34 @@ class LoginController extends GetxController {
Constant.selectedLocation = defaultAddress; Constant.selectedLocation = defaultAddress;
Get.offAll(() => const ServiceListScreen()); Get.offAll(ServiceListScreen());
} else { } else {
Get.offAll(() => const LocationPermissionScreen()); Get.offAll(LocationPermissionScreen());
} }
} else { } else {
await FirebaseAuth.instance.signOut(); await FirebaseAuth.instance.signOut();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This user is disabled. Please contact admin.".tr(), "This user is disabled. Please contact admin.".tr,
); );
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} else { } else {
await FirebaseAuth.instance.signOut(); await FirebaseAuth.instance.signOut();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This user does not exist in the customer app.".tr(), "This user does not exist in the customer app.".tr,
); );
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} on FirebaseAuthException catch (e) { } on FirebaseAuthException catch (e) {
if (e.code == 'user-not-found') { if (e.code == 'user-not-found') {
ShowToastDialog.showToast("No user found for that email.".tr()); ShowToastDialog.showToast("No user found for that email.".tr);
} else if (e.code == 'wrong-password') { } else if (e.code == 'wrong-password') {
ShowToastDialog.showToast("Wrong password provided.".tr()); ShowToastDialog.showToast("Wrong password provided.".tr);
} else if (e.code == 'invalid-email') { } else if (e.code == 'invalid-email') {
ShowToastDialog.showToast("Invalid email.".tr()); ShowToastDialog.showToast("Invalid email.".tr);
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
e.message?.tr() ?? "Login failed. Please try again.".tr(), e.message?.tr ?? "Login failed. Please try again.".tr,
); );
} }
} finally { } finally {
@@ -106,7 +107,7 @@ class LoginController extends GetxController {
} }
Future<void> loginWithGoogle() async { Future<void> loginWithGoogle() async {
ShowToastDialog.showLoader("please wait...".tr()); ShowToastDialog.showLoader("please wait...".tr);
await signInWithGoogle().then((value) async { await signInWithGoogle().then((value) async {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
if (value != null) { if (value != null) {
@@ -148,23 +149,23 @@ class LoginController extends GetxController {
Constant.selectedLocation = defaultAddress; Constant.selectedLocation = defaultAddress;
Get.offAll(() => const ServiceListScreen()); Get.offAll(ServiceListScreen());
} else { } else {
Get.offAll(() => const LocationPermissionScreen()); Get.offAll(LocationPermissionScreen());
} }
} else { } else {
await FirebaseAuth.instance.signOut(); await FirebaseAuth.instance.signOut();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This user is disabled. Please contact admin.".tr(), "This user is disabled. Please contact admin.".tr,
); );
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} else { } else {
await FirebaseAuth.instance.signOut(); await FirebaseAuth.instance.signOut();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This user does not exist in the customer app.".tr(), "This user does not exist in the customer app.".tr,
); );
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} else { } else {
UserModel userModel = UserModel(); UserModel userModel = UserModel();
@@ -186,7 +187,7 @@ class LoginController extends GetxController {
} }
Future<void> loginWithApple() async { Future<void> loginWithApple() async {
ShowToastDialog.showLoader("please wait...".tr()); ShowToastDialog.showLoader("please wait...".tr);
await signInWithApple().then((value) async { await signInWithApple().then((value) async {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
if (value != null) { if (value != null) {
@@ -231,23 +232,23 @@ class LoginController extends GetxController {
); );
Constant.selectedLocation = defaultAddress; Constant.selectedLocation = defaultAddress;
Get.offAll(() => const ServiceListScreen()); Get.offAll(ServiceListScreen());
} else { } else {
Get.offAll(() => const LocationPermissionScreen()); Get.offAll(LocationPermissionScreen());
} }
} else { } else {
await FirebaseAuth.instance.signOut(); await FirebaseAuth.instance.signOut();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This user is disabled. Please contact admin.".tr(), "This user is disabled. Please contact admin.".tr,
); );
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} else { } else {
await FirebaseAuth.instance.signOut(); await FirebaseAuth.instance.signOut();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"This user does not exist in the customer app.".tr(), "This user does not exist in the customer app.".tr,
); );
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} else { } else {
// User not in DB → go to signup // User not in DB → go to signup

2
lib/controllers/map_view_controller.dart
View File

@@ -2,7 +2,7 @@ import 'dart:typed_data';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_map/flutter_map.dart' as flutterMap; import 'package:flutter_map/flutter_map.dart' as flutterMap;
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:latlong2/latlong.dart' as location; import 'package:latlong2/latlong.dart' as location;
import '../screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart'; import '../screen_ui/multi_vendor_service/restaurant_details_screen/restaurant_details_screen.dart';

16
lib/controllers/mobile_login_controller.dart
View File

@@ -1,8 +1,8 @@
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../screen_ui/auth_screens/otp_verification_screen.dart'; import '../screen_ui/auth_screens/otp_verification_screen.dart';
@@ -21,13 +21,13 @@ class MobileLoginController extends GetxController {
if (mobile.isEmpty || mobile.length != 10) { if (mobile.isEmpty || mobile.length != 10) {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Please enter a valid 10-digit mobile number".tr(), "Please enter a valid 10-digit mobile number".tr,
); );
return; return;
} }
try { try {
ShowToastDialog.showLoader("Sending OTP...".tr()); ShowToastDialog.showLoader("Sending OTP...".tr);
await _auth.verifyPhoneNumber( await _auth.verifyPhoneNumber(
phoneNumber: '$countryCode$mobile', phoneNumber: '$countryCode$mobile',
@@ -37,10 +37,10 @@ class MobileLoginController extends GetxController {
verificationFailed: (FirebaseAuthException e) { verificationFailed: (FirebaseAuthException e) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
if (e.code == 'invalid-phone-number') { if (e.code == 'invalid-phone-number') {
ShowToastDialog.showToast("Invalid phone number".tr()); ShowToastDialog.showToast("Invalid phone number".tr);
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
e.message ?? "OTP verification failed".tr(), e.message ?? "OTP verification failed".tr,
); );
} }
}, },
@@ -57,13 +57,13 @@ class MobileLoginController extends GetxController {
}, },
codeAutoRetrievalTimeout: (String verificationId) { codeAutoRetrievalTimeout: (String verificationId) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("OTP timed out. Please try again.".tr()); ShowToastDialog.showToast("OTP timed out. Please try again.".tr);
// Optional: Handle timeout // Optional: Handle timeout
}, },
); );
} catch (e) { } catch (e) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Something went wrong. Please try again.".tr()); ShowToastDialog.showToast("Something went wrong. Please try again.".tr);
} }
} }

2
lib/controllers/my_booking_on_demand_controller.dart
View File

@@ -1,4 +1,4 @@
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/onprovider_order_model.dart'; import '../models/onprovider_order_model.dart';
import '../models/worker_model.dart'; import '../models/worker_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

74
lib/controllers/my_cab_booking_controller.dart
View File

@@ -34,12 +34,12 @@ import 'package:customer/payment/xenditScreen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:razorpay_flutter/razorpay_flutter.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart';
@@ -139,13 +139,13 @@ class MyCabBookingController extends GetxController {
String getLocalizedTabTitle(String tabKey) { String getLocalizedTabTitle(String tabKey) {
switch (tabKey) { switch (tabKey) {
case "New": case "New":
return "New".tr(); return "New".tr;
case "On Going": case "On Going":
return "On Going".tr(); return "On Going".tr;
case "Completed": case "Completed":
return "Completed".tr(); return "Completed".tr;
case "Cancelled": case "Cancelled":
return "Cancelled".tr(); return "Cancelled".tr;
default: default:
return tabKey; return tabKey;
} }
@@ -219,7 +219,7 @@ class MyCabBookingController extends GetxController {
if (selectedPaymentMethod.value == PaymentGateway.cod.name) { if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
selectedOrder.value.paymentMethod = selectedPaymentMethod.value; selectedOrder.value.paymentMethod = selectedPaymentMethod.value;
await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) { await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) {
ShowToastDialog.showToast("Payment method changed".tr()); ShowToastDialog.showToast("Payment method changed".tr);
Get.back(); Get.back();
}); });
} else { } else {
@@ -237,8 +237,8 @@ class MyCabBookingController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
isTopup: false, isTopup: false,
orderId: selectedOrder.value.id, orderId: selectedOrder.value.id,
note: "Cab Amount debited".tr(), note: "Cab Amount debited".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
serviceType: Constant.parcelServiceType, serviceType: Constant.parcelServiceType,
); );
@@ -253,7 +253,7 @@ class MyCabBookingController extends GetxController {
} }
selectedOrder.value.paymentStatus = true; selectedOrder.value.paymentStatus = true;
await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) { await FireStoreUtils.cabOrderPlace(selectedOrder.value).then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
Get.back(); Get.back();
}); });
} }
@@ -348,7 +348,7 @@ class MyCabBookingController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -381,7 +381,7 @@ class MyCabBookingController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -464,10 +464,10 @@ class MyCabBookingController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -499,15 +499,15 @@ class MyCabBookingController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
completeOrder(); completeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -534,15 +534,15 @@ class MyCabBookingController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -585,10 +585,10 @@ class MyCabBookingController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -622,11 +622,11 @@ class MyCabBookingController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -754,7 +754,7 @@ class MyCabBookingController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -791,18 +791,18 @@ class MyCabBookingController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -820,10 +820,10 @@ class MyCabBookingController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -864,7 +864,7 @@ class MyCabBookingController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -907,13 +907,13 @@ class MyCabBookingController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -951,7 +951,7 @@ class MyCabBookingController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1002,7 +1002,7 @@ class MyCabBookingController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1028,11 +1028,11 @@ class MyCabBookingController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

2
lib/controllers/my_profile_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/theme_controller.dart'; import 'package:customer/controllers/theme_controller.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
class MyProfileController extends GetxController { class MyProfileController extends GetxController {

20
lib/controllers/my_rental_booking_controller.dart
View File

@@ -4,8 +4,8 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/models/wallet_transaction_model.dart';
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/rental_order_model.dart'; import '../models/rental_order_model.dart';
import '../models/tax_model.dart'; import '../models/tax_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
@@ -157,7 +157,7 @@ class MyRentalBookingController extends GetxController {
if (selectedPaymentMethod.value == PaymentGateway.cod.name) { if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
selectedOrder.value.paymentMethod = selectedPaymentMethod.value; selectedOrder.value.paymentMethod = selectedPaymentMethod.value;
await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) { await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) {
ShowToastDialog.showToast("Payment method changed".tr()); ShowToastDialog.showToast("Payment method changed".tr);
Get.back(); Get.back();
Get.back(); Get.back();
}); });
@@ -174,8 +174,8 @@ class MyRentalBookingController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
isTopup: false, isTopup: false,
orderId: selectedOrder.value.id, orderId: selectedOrder.value.id,
note: "Rental Amount debited".tr(), note: "Rental Amount debited".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
serviceType: Constant.parcelServiceType, serviceType: Constant.parcelServiceType,
); );
@@ -192,7 +192,7 @@ class MyRentalBookingController extends GetxController {
} }
await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) { await FireStoreUtils.rentalOrderPlace(selectedOrder.value).then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
Get.back(); Get.back();
Get.back(); Get.back();
}); });
@@ -290,8 +290,8 @@ class MyRentalBookingController extends GetxController {
isTopup: true, isTopup: true,
// refund // refund
orderId: order.id, orderId: order.id,
note: "Refund for cancelled booking".tr(), note: "Refund for cancelled booking".tr,
paymentStatus: "success".tr(), paymentStatus: "success".tr,
serviceType: Constant.parcelServiceType, serviceType: Constant.parcelServiceType,
); );
@@ -301,9 +301,9 @@ class MyRentalBookingController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
); );
} }
ShowToastDialog.showToast("Booking cancelled successfully".tr()); ShowToastDialog.showToast("Booking cancelled successfully".tr);
} catch (e) { } catch (e) {
ShowToastDialog.showToast("Failed to cancel booking: $e".tr()); ShowToastDialog.showToast("Failed to cancel booking: $e".tr);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }

2
lib/controllers/on_boarding_controller.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/on_boarding_model.dart'; import '../models/on_boarding_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

13
lib/controllers/on_demand_booking_controller.dart
View File

@@ -2,9 +2,10 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import '../models/onprovider_order_model.dart'; import '../models/onprovider_order_model.dart';
import '../models/provider_serivce_model.dart'; import '../models/provider_serivce_model.dart';
@@ -149,9 +150,9 @@ class OnDemandBookingController extends GetxController {
Future<void> confirmBooking(BuildContext context) async { Future<void> confirmBooking(BuildContext context) async {
if (selectedAddress.value.getFullAddress().isEmpty) { if (selectedAddress.value.getFullAddress().isEmpty) {
ShowToastDialog.showToast("Please enter address".tr()); ShowToastDialog.showToast("Please enter address".tr);
} else if (dateTimeController.value.text.isEmpty) { } else if (dateTimeController.value.text.isEmpty) {
ShowToastDialog.showToast("Please select time slot.".tr()); ShowToastDialog.showToast("Please select time slot.".tr);
} else { } else {
UserModel? providerUser = await FireStoreUtils.getUserProfile( UserModel? providerUser = await FireStoreUtils.getUserProfile(
provider.value!.author!, provider.value!.author!,
@@ -201,7 +202,7 @@ class OnDemandBookingController extends GetxController {
}, },
); );
} else { } else {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
OnProviderOrderModel onDemandOrder = OnProviderOrderModel( OnProviderOrderModel onDemandOrder = OnProviderOrderModel(
otp: Constant.getReferralCode(), otp: Constant.getReferralCode(),
authorID: FireStoreUtils.getCurrentUid(), authorID: FireStoreUtils.getCurrentUid(),
@@ -254,7 +255,7 @@ class OnDemandBookingController extends GetxController {
OnDemandDashboardController(), OnDemandDashboardController(),
); );
controller.selectedIndex.value = 2; controller.selectedIndex.value = 2;
ShowToastDialog.showToast("OnDemand Service successfully booked".tr()); ShowToastDialog.showToast("OnDemand Service successfully booked".tr);
} }
} }
} }

2
lib/controllers/on_demand_category_controller.dart
View File

@@ -1,4 +1,4 @@
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/category_model.dart'; import '../models/category_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

2
lib/controllers/on_demand_dashboard_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import 'package:customer/screen_ui/on_demand_service/favourite_ondemand_screen.dart'; import 'package:customer/screen_ui/on_demand_service/favourite_ondemand_screen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/on_demand_service/my_booking_on_demand_screen.dart'; import '../screen_ui/on_demand_service/my_booking_on_demand_screen.dart';
import '../screen_ui/on_demand_service/on_demand_home_screen.dart'; import '../screen_ui/on_demand_service/on_demand_home_screen.dart';

2
lib/controllers/on_demand_details_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import '../models/favorite_ondemand_service_model.dart'; import '../models/favorite_ondemand_service_model.dart';
import '../models/provider_serivce_model.dart'; import '../models/provider_serivce_model.dart';

2
lib/controllers/on_demand_home_controller.dart
View File

@@ -4,7 +4,7 @@ import 'package:customer/models/favorite_ondemand_service_model.dart';
import 'package:customer/models/provider_serivce_model.dart'; import 'package:customer/models/provider_serivce_model.dart';
import 'package:customer/screen_ui/auth_screens/login_screen.dart'; import 'package:customer/screen_ui/auth_screens/login_screen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';

16
lib/controllers/on_demand_order_details_controller.dart
View File

@@ -2,9 +2,9 @@ import 'dart:developer';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../models/onprovider_order_model.dart'; import '../models/onprovider_order_model.dart';
import '../models/wallet_transaction_model.dart'; import '../models/wallet_transaction_model.dart';
@@ -172,7 +172,7 @@ class OnDemandOrderDetailsController extends GetxController {
final order = onProviderOrder.value; final order = onProviderOrder.value;
if (order == null) return; if (order == null) return;
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
try { try {
double total = 0.0; double total = 0.0;
@@ -222,7 +222,7 @@ class OnDemandOrderDetailsController extends GetxController {
isTopup: true, isTopup: true,
orderId: order.id, orderId: order.id,
note: 'Booking Amount Refund', note: 'Booking Amount Refund',
paymentStatus: "success".tr(), paymentStatus: "success".tr,
), ),
); );
@@ -240,7 +240,7 @@ class OnDemandOrderDetailsController extends GetxController {
isTopup: false, isTopup: false,
orderId: order.id, orderId: order.id,
note: 'Booking Amount Refund', note: 'Booking Amount Refund',
paymentStatus: "success".tr(), paymentStatus: "success".tr,
), ),
); );
} }
@@ -260,7 +260,7 @@ class OnDemandOrderDetailsController extends GetxController {
isTopup: true, isTopup: true,
orderId: order.id, orderId: order.id,
note: 'Admin commission refund', note: 'Admin commission refund',
paymentStatus: "success".tr(), paymentStatus: "success".tr,
), ),
); );
} }
@@ -289,11 +289,11 @@ class OnDemandOrderDetailsController extends GetxController {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
Get.back(); Get.back();
ShowToastDialog.showToast("Booking cancelled successfully".tr()); ShowToastDialog.showToast("Booking cancelled successfully".tr);
} catch (e, st) { } catch (e, st) {
log("Cancel error: $e\n$st"); log("Cancel error: $e\n$st");
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Something went wrong".tr()); ShowToastDialog.showToast("Something went wrong".tr);
} }
} }
} }

8
lib/controllers/on_demand_review_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/collection_name.dart'; import '../constant/collection_name.dart';
import '../models/onprovider_order_model.dart'; import '../models/onprovider_order_model.dart';
import '../models/provider_serivce_model.dart'; import '../models/provider_serivce_model.dart';
@@ -133,7 +133,7 @@ class OnDemandReviewController extends GetxController {
} }
Future<void> _providerReviewSubmit() async { Future<void> _providerReviewSubmit() async {
ShowToastDialog.showLoader("Submit in...".tr()); ShowToastDialog.showLoader("Submit in...".tr);
providerServiceModel.value!.reviewsCount = serviceReviewCount.value + 1; providerServiceModel.value!.reviewsCount = serviceReviewCount.value + 1;
providerServiceModel.value!.reviewsSum = providerServiceModel.value!.reviewsSum =
serviceReviewSum.value + ratings.value; serviceReviewSum.value + ratings.value;
@@ -171,7 +171,7 @@ class OnDemandReviewController extends GetxController {
} }
Future<void> _workerReviewSubmit() async { Future<void> _workerReviewSubmit() async {
ShowToastDialog.showLoader("Submit in...".tr()); ShowToastDialog.showLoader("Submit in...".tr);
workerModel.value!.reviewsCount = workerReviewCount.value + 1; workerModel.value!.reviewsCount = workerReviewCount.value + 1;
workerModel.value!.reviewsSum = workerReviewSum.value + ratings.value; workerModel.value!.reviewsSum = workerReviewSum.value + ratings.value;

2
lib/controllers/order_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/models/cart_product_model.dart';
import 'package:customer/models/order_model.dart'; import 'package:customer/models/order_model.dart';
import '../service/cart_provider.dart'; import '../service/cart_provider.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class OrderController extends GetxController { class OrderController extends GetxController {
RxList<OrderModel> allList = <OrderModel>[].obs; RxList<OrderModel> allList = <OrderModel>[].obs;

2
lib/controllers/order_details_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/cart_product_model.dart'; import 'package:customer/models/cart_product_model.dart';
import 'package:customer/models/order_model.dart'; import 'package:customer/models/order_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../service/cart_provider.dart'; import '../service/cart_provider.dart';
class OrderDetailsController extends GetxController { class OrderDetailsController extends GetxController {

2
lib/controllers/order_placing_controller.dart
View File

@@ -1,6 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:customer/models/order_model.dart'; import 'package:customer/models/order_model.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../service/database_helper.dart'; import '../service/database_helper.dart';
class OrderPlacingController extends GetxController { class OrderPlacingController extends GetxController {

2
lib/controllers/osm_search_place_controller.dart
View File

@@ -1,7 +1,7 @@
import 'dart:developer'; import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_osm_plugin/flutter_osm_plugin.dart'; import 'package:flutter_osm_plugin/flutter_osm_plugin.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
class OsmSearchPlaceController extends GetxController { class OsmSearchPlaceController extends GetxController {

23
lib/controllers/otp_verification_controller.dart
View File

@@ -1,9 +1,10 @@
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../models/user_model.dart'; import '../models/user_model.dart';
import '../screen_ui/auth_screens/login_screen.dart'; import '../screen_ui/auth_screens/login_screen.dart';
@@ -43,7 +44,7 @@ class OtpVerifyController extends GetxController {
codeSent: (String verificationId0, int? resendToken0) async { codeSent: (String verificationId0, int? resendToken0) async {
verificationId.value = verificationId0; verificationId.value = verificationId0;
resendToken.value = resendToken0!; resendToken.value = resendToken0!;
ShowToastDialog.showToast("OTP sent".tr()); ShowToastDialog.showToast("OTP sent".tr);
}, },
timeout: const Duration(seconds: 25), timeout: const Duration(seconds: 25),
forceResendingToken: resendToken.value, forceResendingToken: resendToken.value,
@@ -56,12 +57,12 @@ class OtpVerifyController extends GetxController {
void verifyOtp() async { void verifyOtp() async {
if (otpController.value.text.length != 6) { if (otpController.value.text.length != 6) {
ShowToastDialog.showToast("Enter valid 6-digit OTP".tr()); ShowToastDialog.showToast("Enter valid 6-digit OTP".tr);
return; return;
} }
try { try {
ShowToastDialog.showLoader("Verifying OTP...".tr()); ShowToastDialog.showLoader("Verifying OTP...".tr);
final credential = PhoneAuthProvider.credential( final credential = PhoneAuthProvider.credential(
verificationId: verificationId.value, verificationId: verificationId.value,
@@ -107,14 +108,14 @@ class OtpVerifyController extends GetxController {
final userModel = await FireStoreUtils.getUserProfile(result.user!.uid); final userModel = await FireStoreUtils.getUserProfile(result.user!.uid);
if (userModel == null || userModel.role != 'customer') { if (userModel == null || userModel.role != 'customer') {
await _auth.signOut(); await _auth.signOut();
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
return; return;
} }
if (userModel.active == false) { if (userModel.active == false) {
ShowToastDialog.showToast("This user is disabled".tr()); ShowToastDialog.showToast("This user is disabled".tr);
await _auth.signOut(); await _auth.signOut();
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
return; return;
} }
@@ -128,13 +129,13 @@ class OtpVerifyController extends GetxController {
); );
Constant.selectedLocation = defaultAddress; Constant.selectedLocation = defaultAddress;
Get.offAll(() => const ServiceListScreen()); Get.offAll(ServiceListScreen());
} else { } else {
Get.offAll(() => const LocationPermissionScreen()); Get.offAll(LocationPermissionScreen());
} }
} catch (e) { } catch (e) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Invalid OTP or Verification Failed".tr()); ShowToastDialog.showToast("Invalid OTP or Verification Failed".tr);
} }
} }

2
lib/controllers/parcel_coupon_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class ParcelCouponController extends GetxController { class ParcelCouponController extends GetxController {
@override @override

2
lib/controllers/parcel_dashboard_controller.dart
View File

@@ -3,7 +3,7 @@ import 'package:customer/screen_ui/multi_vendor_service/profile_screen/profile_s
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import 'package:customer/screen_ui/parcel_service/home_parcel_screen.dart'; import 'package:customer/screen_ui/parcel_service/home_parcel_screen.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/parcel_service/my_booking_screen.dart'; import '../screen_ui/parcel_service/my_booking_screen.dart';
class ParcelDashboardController extends GetxController { class ParcelDashboardController extends GetxController {

10
lib/controllers/parcel_my_booking_controller.dart
View File

@@ -1,7 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../models/parcel_order_model.dart'; import '../models/parcel_order_model.dart';
@@ -106,7 +106,7 @@ class ParcelMyBookingController extends GetxController {
isLoading.value = true; isLoading.value = true;
if (order.status != Constant.orderPlaced) { if (order.status != Constant.orderPlaced) {
ShowToastDialog.showToast("You can only cancel before pickup.".tr()); ShowToastDialog.showToast("You can only cancel before pickup.".tr);
return; return;
} }
@@ -160,9 +160,9 @@ class ParcelMyBookingController extends GetxController {
); );
} }
ShowToastDialog.showToast("Order cancelled successfully".tr()); ShowToastDialog.showToast("Order cancelled successfully".tr);
} catch (e) { } catch (e) {
ShowToastDialog.showToast("${'Failed to cancel order:'.tr()} $e".tr()); ShowToastDialog.showToast("${'Failed to cancel order:'.tr} $e".tr);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }

76
lib/controllers/parcel_order_confirmation_controller.dart
View File

@@ -5,11 +5,11 @@ import 'dart:math' as maths;
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/models/wallet_transaction_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
@@ -136,7 +136,7 @@ class ParcelOrderConfirmationController extends GetxController {
} }
Future<void> placeOrder() async { Future<void> placeOrder() async {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
try { try {
List<String> parcelImages = []; List<String> parcelImages = [];
@@ -207,7 +207,7 @@ class ParcelOrderConfirmationController extends GetxController {
value, value,
) async { ) async {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Order placed successfully".tr()); ShowToastDialog.showToast("Order placed successfully".tr);
Get.offAll( Get.offAll(
() => OrderSuccessfullyPlaced(), () => OrderSuccessfullyPlaced(),
arguments: {'parcelOrder': parcelOrder.value}, arguments: {'parcelOrder': parcelOrder.value},
@@ -216,7 +216,7 @@ class ParcelOrderConfirmationController extends GetxController {
}); });
} catch (e) { } catch (e) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Something went wrong. Please try again.".tr()); ShowToastDialog.showToast("Something went wrong. Please try again.".tr);
} }
} }
@@ -324,7 +324,7 @@ class ParcelOrderConfirmationController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -357,7 +357,7 @@ class ParcelOrderConfirmationController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -440,10 +440,10 @@ class ParcelOrderConfirmationController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -480,17 +480,17 @@ class ParcelOrderConfirmationController extends GetxController {
onSuccess: (Map params) async { onSuccess: (Map params) async {
debugPrint("✅ PayPal Payment Success: $params"); debugPrint("✅ PayPal Payment Success: $params");
placeOrder(); placeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
debugPrint("❌ PayPal Payment Error: $error"); debugPrint("❌ PayPal Payment Error: $error");
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
debugPrint("⚠️ PayPal Payment Canceled: $params"); debugPrint("⚠️ PayPal Payment Canceled: $params");
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -521,15 +521,15 @@ class ParcelOrderConfirmationController extends GetxController {
// note: "Contact us for any questions on your order.", // note: "Contact us for any questions on your order.",
// onSuccess: (Map params) async { // onSuccess: (Map params) async {
// placeOrder(); // placeOrder();
// ShowToastDialog.showToast("Payment Successful!!".tr()); // ShowToastDialog.showToast("Payment Successful!!".tr);
// }, // },
// onError: (error) { // onError: (error) {
// Get.back(); // Get.back();
// ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); // ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
// }, // },
// onCancel: (params) { // onCancel: (params) {
// Get.back(); // Get.back();
// ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); // ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
// }, // },
// ), // ),
// ), // ),
@@ -559,15 +559,15 @@ class ParcelOrderConfirmationController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -614,10 +614,10 @@ class ParcelOrderConfirmationController extends GetxController {
bool isVerified = await verifyFlutterWavePayment(_ref!); bool isVerified = await verifyFlutterWavePayment(_ref!);
if (isVerified) { if (isVerified) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
Get.back(); Get.back();
} }
}); });
@@ -676,11 +676,11 @@ class ParcelOrderConfirmationController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
placeOrder(); placeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -833,7 +833,7 @@ class ParcelOrderConfirmationController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
@@ -866,7 +866,7 @@ class ParcelOrderConfirmationController extends GetxController {
// final data = jsonDecode(response.body); // final data = jsonDecode(response.body);
// if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) { // if (data["body"]["txnToken"] == null || data["body"]["txnToken"].toString().isEmpty) {
// Get.back(); // Get.back();
// ShowToastDialog.showToast("something went wrong, please contact admin.".tr()); // ShowToastDialog.showToast("something went wrong, please contact admin.".tr);
// } // }
// return GetPaymentTxtTokenModel.fromJson(data); // return GetPaymentTxtTokenModel.fromJson(data);
// } // }
@@ -902,18 +902,18 @@ class ParcelOrderConfirmationController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -931,10 +931,10 @@ class ParcelOrderConfirmationController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -975,7 +975,7 @@ class ParcelOrderConfirmationController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1002,7 +1002,7 @@ class ParcelOrderConfirmationController extends GetxController {
debugPrint('🟩 Starting OrangePay Payment...'); debugPrint('🟩 Starting OrangePay Payment...');
debugPrint('💰 Amount: $amount | 🆔 Order ID: $id'); debugPrint('💰 Amount: $amount | 🆔 Order ID: $id');
ShowToastDialog.showLoader("Initializing payment...".tr()); ShowToastDialog.showLoader("Initializing payment...".tr);
var paymentURL = await fetchToken( var paymentURL = await fetchToken(
context: context, context: context,
@@ -1027,20 +1027,20 @@ class ParcelOrderConfirmationController extends GetxController {
), ),
)?.then((value) async { )?.then((value) async {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
debugPrint('🎉 Payment Successful for Order ID: $orderId'); debugPrint('🎉 Payment Successful for Order ID: $orderId');
if (Get.isBottomSheetOpen ?? false) Get.back(); if (Get.isBottomSheetOpen ?? false) Get.back();
await placeOrder(); await placeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
debugPrint('⚠️ Payment flow closed without success.'); debugPrint('⚠️ Payment flow closed without success.');
if (Get.isBottomSheetOpen ?? false) Get.back(); if (Get.isBottomSheetOpen ?? false) Get.back();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
if (Get.isBottomSheetOpen ?? false) Get.back(); if (Get.isBottomSheetOpen ?? false) Get.back();
} }
} }
@@ -1086,7 +1086,7 @@ class ParcelOrderConfirmationController extends GetxController {
} else { } else {
debugPrint('❌ Failed to fetch access token.'); debugPrint('❌ Failed to fetch access token.');
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1152,7 +1152,7 @@ class ParcelOrderConfirmationController extends GetxController {
} else { } else {
debugPrint('❌ Payment request failed.'); debugPrint('❌ Payment request failed.');
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1179,11 +1179,11 @@ class ParcelOrderConfirmationController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
placeOrder(); placeOrder();
(); ();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

8
lib/controllers/parcel_order_details_controller.dart
View File

@@ -3,8 +3,8 @@ import 'package:customer/models/rating_model.dart';
import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/models/wallet_transaction_model.dart';
import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart'; import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_screen.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../models/parcel_category.dart'; import '../models/parcel_category.dart';
@@ -108,7 +108,7 @@ class ParcelOrderDetailsController extends GetxController {
} }
Future<void> cancelParcelOrder() async { Future<void> cancelParcelOrder() async {
ShowToastDialog.showLoader("Cancelling order...".tr()); ShowToastDialog.showLoader("Cancelling order...".tr);
parcelOrder.value.status = Constant.orderCancelled; parcelOrder.value.status = Constant.orderCancelled;
if (parcelOrder.value.paymentMethod?.toLowerCase() != "cod") { if (parcelOrder.value.paymentMethod?.toLowerCase() != "cod") {
WalletTransactionModel walletTransaction = WalletTransactionModel( WalletTransactionModel walletTransaction = WalletTransactionModel(
@@ -137,7 +137,7 @@ class ParcelOrderDetailsController extends GetxController {
await FireStoreUtils.parcelOrderPlace(parcelOrder.value); await FireStoreUtils.parcelOrderPlace(parcelOrder.value);
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Order cancelled successfully".tr()); ShowToastDialog.showToast("Order cancelled successfully".tr);
Get.back(result: true); Get.back(result: true);
} }

8
lib/controllers/parcel_review_controller.dart
View File

@@ -1,8 +1,8 @@
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/parcel_order_model.dart'; import 'package:customer/models/parcel_order_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/rating_model.dart'; import '../models/rating_model.dart';
import '../models/user_model.dart'; import '../models/user_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
@@ -76,11 +76,11 @@ class ParcelReviewController extends GetxController {
/// Save / update review /// Save / update review
Future<void> submitReview() async { Future<void> submitReview() async {
if (comment.value.text.trim().isEmpty || ratings.value == 0) { if (comment.value.text.trim().isEmpty || ratings.value == 0) {
ShowToastDialog.showToast("Please provide rating and comment".tr()); ShowToastDialog.showToast("Please provide rating and comment".tr);
return; return;
} }
ShowToastDialog.showLoader("Submit in...".tr()); ShowToastDialog.showLoader("Submit in...".tr);
final user = await FireStoreUtils.getUserProfile( final user = await FireStoreUtils.getUserProfile(
order.value?.driverId ?? '', order.value?.driverId ?? '',

2
lib/controllers/provider_controller.dart
View File

@@ -1,5 +1,5 @@
import 'package:customer/controllers/on_demand_home_controller.dart'; import 'package:customer/controllers/on_demand_home_controller.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/provider_serivce_model.dart'; import '../models/provider_serivce_model.dart';
import '../models/user_model.dart'; import '../models/user_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

10
lib/controllers/rate_product_controller.dart
View File

@@ -6,13 +6,13 @@ import 'package:customer/models/order_model.dart';
import 'package:customer/models/product_model.dart'; import 'package:customer/models/product_model.dart';
import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/models/vendor_category_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:easy_localization/easy_localization.dart';
import '../models/rating_model.dart'; import '../models/rating_model.dart';
import '../models/review_attribute_model.dart'; import '../models/review_attribute_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import '../themes/show_toast_dialog.dart'; import '../themes/show_toast_dialog.dart';
@@ -142,7 +142,7 @@ class RateProductController extends GetxController {
Future<void> saveRating() async { Future<void> saveRating() async {
if (ratings.value != 0.0) { if (ratings.value != 0.0) {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
productModel.value.reviewsCount = productReviewCount.value + 1; productModel.value.reviewsCount = productReviewCount.value + 1;
productModel.value.reviewsSum = productReviewSum.value + ratings.value; productModel.value.reviewsSum = productReviewSum.value + ratings.value;
productModel.value.reviewAttributes = reviewProductAttributes; productModel.value.reviewAttributes = reviewProductAttributes;
@@ -213,10 +213,10 @@ class RateProductController extends GetxController {
await FireStoreUtils.updateVendor(vendorModel.value); await FireStoreUtils.updateVendor(vendorModel.value);
await FireStoreUtils.setProduct(productModel.value); await FireStoreUtils.setProduct(productModel.value);
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Rating saved successfully.".tr()); ShowToastDialog.showToast("Rating saved successfully.".tr);
Get.back(); Get.back();
} else { } else {
ShowToastDialog.showToast("Please add rate for food item.".tr()); ShowToastDialog.showToast("Please add rate for food item.".tr);
} }
} }

2
lib/controllers/redeem_gift_card_controller.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class RedeemGiftCardController extends GetxController { class RedeemGiftCardController extends GetxController {
Rx<TextEditingController> giftCodeController = TextEditingController().obs; Rx<TextEditingController> giftCodeController = TextEditingController().obs;

2
lib/controllers/refer_friend_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/referral_model.dart'; import 'package:customer/models/referral_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class ReferFriendController extends GetxController { class ReferFriendController extends GetxController {
Rx<ReferralModel> referralModel = ReferralModel().obs; Rx<ReferralModel> referralModel = ReferralModel().obs;

11
lib/controllers/rental_conformation_controller.dart
View File

@@ -5,9 +5,10 @@ import 'package:customer/models/coupon_model.dart';
import 'package:customer/models/rental_order_model.dart'; import 'package:customer/models/rental_order_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/rental_service/rental_dashboard_screen.dart'; import '../screen_ui/rental_service/rental_dashboard_screen.dart';
import 'cab_rental_dashboard_controllers.dart'; import 'cab_rental_dashboard_controllers.dart';
@@ -81,7 +82,7 @@ class RentalConformationController extends GetxController {
} }
Future<void> placeOrder() async { Future<void> placeOrder() async {
ShowToastDialog.showLoader("Placing booking...".tr()); ShowToastDialog.showLoader("Placing booking...".tr);
rentalOrderModel.value.discount = discount.value.toString(); rentalOrderModel.value.discount = discount.value.toString();
rentalOrderModel.value.couponCode = selectedCouponModel.value.code; rentalOrderModel.value.couponCode = selectedCouponModel.value.code;
rentalOrderModel.value.couponId = selectedCouponModel.value.id; rentalOrderModel.value.couponId = selectedCouponModel.value.id;
@@ -92,8 +93,8 @@ class RentalConformationController extends GetxController {
value, value,
) async { ) async {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
ShowToastDialog.showToast("Order placed successfully".tr()); ShowToastDialog.showToast("Order placed successfully".tr);
Get.offAll(const RentalDashboardScreen()); Get.offAll(RentalDashboardScreen());
CabRentalDashboardControllers controller = Get.put( CabRentalDashboardControllers controller = Get.put(
CabRentalDashboardControllers(), CabRentalDashboardControllers(),
); );

2
lib/controllers/rental_coupon_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/coupon_model.dart'; import 'package:customer/models/coupon_model.dart';
import 'package:customer/service/fire_store_utils.dart'; import 'package:customer/service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class RentalCouponController extends GetxController { class RentalCouponController extends GetxController {
@override @override

6
lib/controllers/rental_home_controller.dart
View File

@@ -7,10 +7,10 @@ import 'package:customer/models/user_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import 'package:customer/screen_ui/rental_service/rental_conformation_screen.dart'; import 'package:customer/screen_ui/rental_service/rental_conformation_screen.dart';
import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart'; import 'package:customer/widget/geoflutterfire/src/geoflutterfire.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong; import 'package:google_maps_flutter/google_maps_flutter.dart' as latlong;
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../models/payment_model/cod_setting_model.dart'; import '../models/payment_model/cod_setting_model.dart';
@@ -92,7 +92,7 @@ class RentalHomeController extends GetxController {
sourceTextEditController.value.text = address; sourceTextEditController.value.text = address;
} }
} catch (e) { } catch (e) {
ShowToastDialog.showToast("Unable to fetch current location".tr()); ShowToastDialog.showToast("Unable to fetch current location".tr);
} }
} }

68
lib/controllers/rental_order_details_controller.dart
View File

@@ -35,11 +35,11 @@ import 'package:customer/screen_ui/multi_vendor_service/wallet_screen/wallet_scr
import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/app_them_data.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:razorpay_flutter/razorpay_flutter.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@@ -210,7 +210,7 @@ class RentalOrderDetailsController extends GetxController {
totalAmount.value = (subTotal.value - discount.value) + taxAmount.value; totalAmount.value = (subTotal.value - discount.value) + taxAmount.value;
} catch (e) { } catch (e) {
ShowToastDialog.showToast("${'Failed to calculate total:'.tr()} $e"); ShowToastDialog.showToast("${'Failed to calculate total:'.tr} $e");
} }
} }
@@ -218,7 +218,7 @@ class RentalOrderDetailsController extends GetxController {
if (selectedPaymentMethod.value == PaymentGateway.cod.name) { if (selectedPaymentMethod.value == PaymentGateway.cod.name) {
order.value.paymentMethod = selectedPaymentMethod.value; order.value.paymentMethod = selectedPaymentMethod.value;
await FireStoreUtils.rentalOrderPlace(order.value).then((value) { await FireStoreUtils.rentalOrderPlace(order.value).then((value) {
ShowToastDialog.showToast("Payment method changed".tr()); ShowToastDialog.showToast("Payment method changed".tr);
Get.back(); Get.back();
Get.back(); Get.back();
}); });
@@ -253,7 +253,7 @@ class RentalOrderDetailsController extends GetxController {
} }
await FireStoreUtils.rentalOrderPlace(order.value).then((value) { await FireStoreUtils.rentalOrderPlace(order.value).then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
Get.back(); Get.back();
Get.back(); Get.back();
}); });
@@ -311,10 +311,10 @@ class RentalOrderDetailsController extends GetxController {
userId: FireStoreUtils.getCurrentUid(), userId: FireStoreUtils.getCurrentUid(),
); );
} }
ShowToastDialog.showToast("Booking cancelled successfully".tr()); ShowToastDialog.showToast("Booking cancelled successfully".tr);
Get.back(); Get.back();
} catch (e) { } catch (e) {
ShowToastDialog.showToast("${'Failed to cancel booking:'.tr()} $e".tr()); ShowToastDialog.showToast("${'Failed to cancel booking:'.tr} $e".tr);
} finally { } finally {
isLoading.value = false; isLoading.value = false;
} }
@@ -424,7 +424,7 @@ class RentalOrderDetailsController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -457,7 +457,7 @@ class RentalOrderDetailsController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -540,10 +540,10 @@ class RentalOrderDetailsController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -575,15 +575,15 @@ class RentalOrderDetailsController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
completeOrder(); completeOrder();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -610,15 +610,15 @@ class RentalOrderDetailsController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -661,10 +661,10 @@ class RentalOrderDetailsController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -698,11 +698,11 @@ class RentalOrderDetailsController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
completeOrder(); completeOrder();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -830,7 +830,7 @@ class RentalOrderDetailsController extends GetxController {
data["body"]["txnToken"].toString().isEmpty) { data["body"]["txnToken"].toString().isEmpty) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
} }
return GetPaymentTxtTokenModel.fromJson(data); return GetPaymentTxtTokenModel.fromJson(data);
@@ -867,18 +867,18 @@ class RentalOrderDetailsController extends GetxController {
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
bool isCurrentDateInRange(DateTime startDate, DateTime endDate) { bool isCurrentDateInRange(DateTime startDate, DateTime endDate) {
@@ -896,10 +896,10 @@ class RentalOrderDetailsController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -940,7 +940,7 @@ class RentalOrderDetailsController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -983,13 +983,13 @@ class RentalOrderDetailsController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
(); ();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -1027,7 +1027,7 @@ class RentalOrderDetailsController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1078,7 +1078,7 @@ class RentalOrderDetailsController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -1103,10 +1103,10 @@ class RentalOrderDetailsController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
completeOrder(); completeOrder();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

8
lib/controllers/rental_review_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../constant/collection_name.dart'; import '../constant/collection_name.dart';
import '../models/rating_model.dart'; import '../models/rating_model.dart';
import '../models/rental_order_model.dart'; import '../models/rental_order_model.dart';
@@ -77,11 +77,11 @@ class RentalReviewController extends GetxController {
/// Save / update review /// Save / update review
Future<void> submitReview() async { Future<void> submitReview() async {
if (comment.value.text.trim().isEmpty || ratings.value == 0) { if (comment.value.text.trim().isEmpty || ratings.value == 0) {
ShowToastDialog.showToast("Please provide rating and comment".tr()); ShowToastDialog.showToast("Please provide rating and comment".tr);
return; return;
} }
ShowToastDialog.showLoader("Submit in...".tr()); ShowToastDialog.showLoader("Submit in...".tr);
final user = await FireStoreUtils.getUserProfile( final user = await FireStoreUtils.getUserProfile(
order.value?.driverId ?? '', order.value?.driverId ?? '',

2
lib/controllers/restaurant_details_controller.dart
View File

@@ -13,7 +13,7 @@ import '../models/attributes_model.dart';
import '../service/cart_provider.dart'; import '../service/cart_provider.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
class RestaurantDetailsController extends GetxController { class RestaurantDetailsController extends GetxController {

2
lib/controllers/restaurant_list_controller.dart
View File

@@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/models/favourite_model.dart'; import 'package:customer/models/favourite_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class RestaurantListController extends GetxController { class RestaurantListController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/review_list_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:customer/models/rating_model.dart'; import 'package:customer/models/rating_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class ReviewListController extends GetxController { class ReviewListController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/scan_qr_code_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class ScanQrCodeController extends GetxController { class ScanQrCodeController extends GetxController {
@override @override

2
lib/controllers/search_controller.dart
View File

@@ -2,7 +2,7 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/models/product_model.dart'; import 'package:customer/models/product_model.dart';
import 'package:customer/models/vendor_model.dart'; import 'package:customer/models/vendor_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class SearchScreenController extends GetxController { class SearchScreenController extends GetxController {
@override @override

15
lib/controllers/service_list_controller.dart
View File

@@ -12,11 +12,12 @@ import 'package:customer/models/currency_model.dart';
import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/app_them_data.dart';
import 'package:customer/themes/round_button_fill.dart'; import 'package:customer/themes/round_button_fill.dart';
import 'package:customer/themes/show_toast_dialog.dart'; import 'package:customer/themes/show_toast_dialog.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:firebase_auth/firebase_auth.dart' as auth;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/auth_screens/login_screen.dart'; import '../screen_ui/auth_screens/login_screen.dart';
import '../screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart'; import '../screen_ui/multi_vendor_service/dash_board_screens/dash_board_screen.dart';
import '../screen_ui/on_demand_service/on_demand_dashboard_screen.dart'; import '../screen_ui/on_demand_service/on_demand_dashboard_screen.dart';
@@ -76,7 +77,7 @@ class ServiceListController extends GetxController {
SectionModel sectionModel, SectionModel sectionModel,
) async { ) async {
try { try {
ShowToastDialog.showLoader("Please wait...".tr()); ShowToastDialog.showLoader("Please wait...".tr);
Constant.sectionConstantModel = sectionModel; Constant.sectionConstantModel = sectionModel;
AppThemeData.primary300 = Color( AppThemeData.primary300 = Color(
int.tryParse(sectionModel.color?.replaceFirst("#", "0xff") ?? '') ?? int.tryParse(sectionModel.color?.replaceFirst("#", "0xff") ?? '') ??
@@ -92,7 +93,7 @@ class ServiceListController extends GetxController {
await _navigate(sectionModel); await _navigate(sectionModel);
} else { } else {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
} }
} else { } else {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
@@ -161,7 +162,7 @@ class ServiceListController extends GetxController {
children: [ children: [
Text( Text(
"If you select this Section/Service, your previously added items will be removed from the cart." "If you select this Section/Service, your previously added items will be removed from the cart."
.tr(), .tr,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
@@ -171,7 +172,7 @@ class ServiceListController extends GetxController {
child: RoundedButtonFill( child: RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
height: 5.5, height: 5.5,
title: "Cancel".tr(), title: "Cancel".tr,
onPress: () { onPress: () {
Get.back(); Get.back();
}, },
@@ -183,7 +184,7 @@ class ServiceListController extends GetxController {
Expanded( Expanded(
child: RoundedButtonFill( child: RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
title: "OK".tr(), title: "OK".tr,
height: 5.5, height: 5.5,
onPress: () async { onPress: () async {
DatabaseHelper.instance.deleteAllCartProducts(); DatabaseHelper.instance.deleteAllCartProducts();

37
lib/controllers/sign_up_controller.dart
View File

@@ -1,9 +1,10 @@
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:firebase_auth/firebase_auth.dart' as auth;
import '../constant/constant.dart'; import '../constant/constant.dart';
import '../models/referral_model.dart'; import '../models/referral_model.dart';
@@ -68,7 +69,7 @@ class SignUpController extends GetxController {
try { try {
if (!_validateInputs()) return; if (!_validateInputs()) return;
ShowToastDialog.showLoader("Creating account...".tr()); ShowToastDialog.showLoader("Creating account...".tr);
if (type.value == "mobileNumber") { if (type.value == "mobileNumber") {
await _signUpWithMobile(); await _signUpWithMobile();
@@ -80,32 +81,32 @@ class SignUpController extends GetxController {
} catch (e, st) { } catch (e, st) {
ShowToastDialog.closeLoader(); ShowToastDialog.closeLoader();
debugPrint("SIGNUP OUTER EXCEPTION: $e\n$st"); debugPrint("SIGNUP OUTER EXCEPTION: $e\n$st");
ShowToastDialog.showToast("${'signup_failed'.tr()}: $e"); ShowToastDialog.showToast("${'signup_failed'.tr}: $e");
} }
} }
/// Validation Logic /// Validation Logic
bool _validateInputs() { bool _validateInputs() {
if (firstNameController.value.text.isEmpty) { if (firstNameController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter first name".tr()); ShowToastDialog.showToast("Please enter first name".tr);
return false; return false;
} else if (lastNameController.value.text.isEmpty) { } else if (lastNameController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter last name".tr()); ShowToastDialog.showToast("Please enter last name".tr);
return false; return false;
} else if (emailController.value.text.isEmpty || } else if (emailController.value.text.isEmpty ||
!emailController.value.text.isEmail) { !emailController.value.text.isEmail) {
ShowToastDialog.showToast("Please enter a valid email address".tr()); ShowToastDialog.showToast("Please enter a valid email address".tr);
return false; return false;
} else if (mobileController.value.text.isEmpty) { } else if (mobileController.value.text.isEmpty) {
ShowToastDialog.showToast("Please enter a valid phone number".tr()); ShowToastDialog.showToast("Please enter a valid phone number".tr);
return false; return false;
} else if (passwordController.value.text.length < 6) { } else if (passwordController.value.text.length < 6) {
ShowToastDialog.showToast("Password must be at least 6 characters".tr()); ShowToastDialog.showToast("Password must be at least 6 characters".tr);
return false; return false;
} else if (passwordController.value.text != } else if (passwordController.value.text !=
confirmPasswordController.value.text) { confirmPasswordController.value.text) {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Password and Confirm password do not match".tr(), "Password and Confirm password do not match".tr,
); );
return false; return false;
} }
@@ -132,18 +133,18 @@ class SignUpController extends GetxController {
"FirebaseAuthException caught: code=${e.code}, message=${e.message}", "FirebaseAuthException caught: code=${e.code}, message=${e.message}",
); );
if (e.code == 'email-already-in-use') { if (e.code == 'email-already-in-use') {
ShowToastDialog.showToast("Email already in use".tr()); ShowToastDialog.showToast("Email already in use".tr);
} else if (e.code == 'weak-password') { } else if (e.code == 'weak-password') {
ShowToastDialog.showToast("Password is too weak".tr()); ShowToastDialog.showToast("Password is too weak".tr);
} else if (e.code == 'invalid-email') { } else if (e.code == 'invalid-email') {
ShowToastDialog.showToast("Invalid email address".tr()); ShowToastDialog.showToast("Invalid email address".tr);
} else { } else {
ShowToastDialog.showToast(e.message ?? "signup_failed".tr()); ShowToastDialog.showToast(e.message ?? "signup_failed".tr);
} }
} catch (e) { } catch (e) {
debugPrint("Something went wrong: ${e.toString()}"); debugPrint("Something went wrong: ${e.toString()}");
ShowToastDialog.showToast( ShowToastDialog.showToast(
"${'something_went_wrong'.tr()}: ${e.toString()}", "${'something_went_wrong'.tr}: ${e.toString()}",
); );
} }
} }
@@ -161,7 +162,7 @@ class SignUpController extends GetxController {
_navigateBasedOnAddress(userModel.value); _navigateBasedOnAddress(userModel.value);
} catch (e) { } catch (e) {
ShowToastDialog.showToast("${'signup_failed'.tr()}: $e"); ShowToastDialog.showToast("${'signup_failed'.tr}: $e");
} }
} }
@@ -212,9 +213,9 @@ class SignUpController extends GetxController {
/// Save the default address to global constant /// Save the default address to global constant
Constant.selectedLocation = defaultAddress; Constant.selectedLocation = defaultAddress;
Get.offAll(() => const ServiceListScreen()); Get.offAll(ServiceListScreen());
} else { } else {
Get.offAll(() => const LocationPermissionScreen()); Get.offAll(LocationPermissionScreen());
} }
} }
} }

3
lib/controllers/splash_controller.dart
View File

@@ -4,11 +4,12 @@ import 'package:customer/constant/constant.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:customer/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart'; import 'package:customer/screen_ui/maintenance_mode_screen/maintenance_mode_screen.dart';
import 'package:customer/screen_ui/service_home_screen/service_list_screen.dart'; import 'package:customer/screen_ui/service_home_screen/service_list_screen.dart';
import 'package:customer/utils/app_router.dart';
import 'package:customer/utils/notification_service.dart'; import 'package:customer/utils/notification_service.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../screen_ui/auth_screens/login_screen.dart'; import '../screen_ui/auth_screens/login_screen.dart';
import '../screen_ui/location_enable_screens/location_permission_screen.dart'; import '../screen_ui/location_enable_screens/location_permission_screen.dart';
import '../screen_ui/on_boarding_screen/on_boarding_screen.dart'; import '../screen_ui/on_boarding_screen/on_boarding_screen.dart';

2
lib/controllers/theme_controller.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../utils/preferences.dart'; import '../utils/preferences.dart';
class ThemeController extends GetxController { class ThemeController extends GetxController {

2
lib/controllers/view_all_category_controller.dart
View File

@@ -1,7 +1,7 @@
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/models/vendor_category_model.dart'; import 'package:customer/models/vendor_category_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
class ViewAllCategoryController extends GetxController { class ViewAllCategoryController extends GetxController {
RxBool isLoading = true.obs; RxBool isLoading = true.obs;

2
lib/controllers/view_all_popular_service_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/on_demand_home_controller.dart'; import 'package:customer/controllers/on_demand_home_controller.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../models/favorite_ondemand_service_model.dart'; import '../models/favorite_ondemand_service_model.dart';
import '../models/provider_serivce_model.dart'; import '../models/provider_serivce_model.dart';

2
lib/controllers/view_category_service_controller.dart
View File

@@ -1,6 +1,6 @@
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:customer/controllers/on_demand_home_controller.dart'; import 'package:customer/controllers/on_demand_home_controller.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../models/provider_serivce_model.dart'; import '../models/provider_serivce_model.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';

60
lib/controllers/wallet_controller.dart
View File

@@ -17,7 +17,7 @@ import 'package:customer/models/payment_model/xendit.dart';
import 'package:customer/models/user_model.dart'; import 'package:customer/models/user_model.dart';
import 'package:customer/models/wallet_transaction_model.dart'; import 'package:customer/models/wallet_transaction_model.dart';
import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/app_them_data.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter_paypal/flutter_paypal.dart'; import 'package:flutter_paypal/flutter_paypal.dart';
import 'package:flutter_stripe/flutter_stripe.dart'; import 'package:flutter_stripe/flutter_stripe.dart';
import 'package:razorpay_flutter/razorpay_flutter.dart'; import 'package:razorpay_flutter/razorpay_flutter.dart';
@@ -34,7 +34,7 @@ import '../payment/xenditScreen.dart';
import '../service/fire_store_utils.dart'; import '../service/fire_store_utils.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@@ -160,7 +160,7 @@ class WalletController extends GetxController {
} }
}); });
ShowToastDialog.showToast("Amount Top-up successfully".tr()); ShowToastDialog.showToast("Amount Top-up successfully".tr);
} }
// Strip // Strip
@@ -174,7 +174,7 @@ class WalletController extends GetxController {
if (paymentIntentData!.containsKey("error")) { if (paymentIntentData!.containsKey("error")) {
Get.back(); Get.back();
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} else { } else {
await Stripe.instance.initPaymentSheet( await Stripe.instance.initPaymentSheet(
@@ -207,7 +207,7 @@ class WalletController extends GetxController {
Future<void> displayStripePaymentSheet({required String amount}) async { Future<void> displayStripePaymentSheet({required String amount}) async {
try { try {
await Stripe.instance.presentPaymentSheet().then((value) { await Stripe.instance.presentPaymentSheet().then((value) {
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
walletTopUp(); walletTopUp();
}); });
} on StripeException catch (e) { } on StripeException catch (e) {
@@ -290,15 +290,15 @@ class WalletController extends GetxController {
final data = jsonDecode(response.body); final data = jsonDecode(response.body);
Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) { Get.to(MercadoPagoScreen(initialURl: data['init_point']))!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something want wrong please contact administrator".tr(), "Something want wrong please contact administrator".tr,
); );
print('Error creating preference: ${response.body}'); print('Error creating preference: ${response.body}');
return null; return null;
@@ -327,15 +327,15 @@ class WalletController extends GetxController {
note: "Contact us for any questions on your order.", note: "Contact us for any questions on your order.",
onSuccess: (Map params) async { onSuccess: (Map params) async {
walletTopUp(); walletTopUp();
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
}, },
onError: (error) { onError: (error) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
onCancel: (params) { onCancel: (params) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
}, },
), ),
), ),
@@ -362,15 +362,15 @@ class WalletController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
} }
}); });
@@ -412,10 +412,10 @@ class WalletController extends GetxController {
value, value,
) { ) {
if (value) { if (value) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} else { } else {
ShowToastDialog.showToast("Payment UnSuccessful!!".tr()); ShowToastDialog.showToast("Payment UnSuccessful!!".tr);
} }
}); });
} else { } else {
@@ -449,11 +449,11 @@ class WalletController extends GetxController {
); );
if (isDone) { if (isDone) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment successfully".tr()); ShowToastDialog.showToast("Payment successfully".tr);
walletTopUp(); walletTopUp();
} else { } else {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed".tr()); ShowToastDialog.showToast("Payment Failed".tr);
} }
}); });
} }
@@ -488,18 +488,18 @@ class WalletController extends GetxController {
} }
void handlePaymentSuccess(PaymentSuccessResponse response) { void handlePaymentSuccess(PaymentSuccessResponse response) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} }
void handleExternalWaller(ExternalWalletResponse response) { void handleExternalWaller(ExternalWalletResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Processing!! via".tr()); ShowToastDialog.showToast("Payment Processing!! via".tr);
} }
void handlePaymentError(PaymentFailureResponse response) { void handlePaymentError(PaymentFailureResponse response) {
Get.back(); Get.back();
ShowToastDialog.showToast("Payment Failed!!".tr()); ShowToastDialog.showToast("Payment Failed!!".tr);
} }
//Midtrans payment //Midtrans payment
@@ -512,10 +512,10 @@ class WalletController extends GetxController {
if (url != '') { if (url != '') {
Get.to(() => MidtransScreen(initialURl: url))!.then((value) { Get.to(() => MidtransScreen(initialURl: url))!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }
@@ -556,7 +556,7 @@ class WalletController extends GetxController {
return responseData['payment_url']; return responseData['payment_url'];
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"something went wrong, please contact admin.".tr(), "something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -599,12 +599,12 @@ class WalletController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} }
}); });
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
} }
@@ -639,7 +639,7 @@ class WalletController extends GetxController {
); );
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -692,7 +692,7 @@ class WalletController extends GetxController {
} }
} else { } else {
ShowToastDialog.showToast( ShowToastDialog.showToast(
"Something went wrong, please contact admin.".tr(), "Something went wrong, please contact admin.".tr,
); );
return ''; return '';
} }
@@ -718,10 +718,10 @@ class WalletController extends GetxController {
), ),
)!.then((value) { )!.then((value) {
if (value == true) { if (value == true) {
ShowToastDialog.showToast("Payment Successful!!".tr()); ShowToastDialog.showToast("Payment Successful!!".tr);
walletTopUp(); walletTopUp();
} else { } else {
ShowToastDialog.showToast("Payment Unsuccessful!!".tr()); ShowToastDialog.showToast("Payment Unsuccessful!!".tr);
} }
}); });
} }

28
lib/main.dart
View File

@@ -4,11 +4,10 @@ import 'package:customer/themes/app_them_data.dart';
import 'package:customer/themes/easy_loading_config.dart'; import 'package:customer/themes/easy_loading_config.dart';
import 'package:customer/utils/app_router.dart'; import 'package:customer/utils/app_router.dart';
import 'package:customer/utils/preferences.dart'; import 'package:customer/utils/preferences.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_phoenix/flutter_phoenix.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'controllers/global_setting_controller.dart'; import 'controllers/global_setting_controller.dart';
@@ -17,7 +16,7 @@ import 'firebase_options.dart';
void main() async { void main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await EasyLocalization.ensureInitialized(); await LocalizationService.init();
await Firebase.initializeApp( await Firebase.initializeApp(
name: 'default', name: 'default',
options: DefaultFirebaseOptions.currentPlatform, options: DefaultFirebaseOptions.currentPlatform,
@@ -28,19 +27,7 @@ void main() async {
Get.put(ThemeController()); Get.put(ThemeController());
await configEasyLoading(); await configEasyLoading();
runApp( runApp(MyApp());
EasyLocalization(
startLocale: Locale('uz', 'UZ'),
supportedLocales: [
Locale('en', 'US'),
Locale('uz', 'UZ'),
Locale('ru', 'RU'),
],
path: 'assets/translations',
fallbackLocale: Locale('uz', 'UZ'),
child: MyApp(),
),
);
} }
class MyApp extends StatelessWidget { class MyApp extends StatelessWidget {
@@ -56,11 +43,12 @@ class MyApp extends StatelessWidget {
designSize: Size(375, 812), designSize: Size(375, 812),
minTextAdapt: true, minTextAdapt: true,
splitScreenMode: true, splitScreenMode: true,
child: MaterialApp( child: GetMaterialApp(
translations: LocalizationService(),
locale: const Locale('uz', 'UZ'),
navigatorKey: AppRouter.navigatorKey, navigatorKey: AppRouter.navigatorKey,
localizationsDelegates: context.localizationDelegates, fallbackLocale: const Locale('uz', 'UZ'),
supportedLocales: context.supportedLocales, supportedLocales: LocalizationService.supportedLocales,
locale: context.locale,
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
builder: (context, child) { builder: (context, child) {
return SafeArea( return SafeArea(

14
lib/payment/MercadoPagoScreen.dart
View File

@@ -1,9 +1,9 @@
import 'dart:async'; import 'dart:async';
import 'package:customer/constant/constant.dart'; import 'package:customer/constant/constant.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
class MercadoPagoScreen extends StatefulWidget { class MercadoPagoScreen extends StatefulWidget {
@@ -65,7 +65,7 @@ class _MercadoPagoScreenState extends State<MercadoPagoScreen> {
}, },
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text("Payment".tr()), title: Text("Payment".tr),
centerTitle: false, centerTitle: false,
leading: GestureDetector( leading: GestureDetector(
onTap: () { onTap: () {
@@ -85,12 +85,12 @@ class _MercadoPagoScreenState extends State<MercadoPagoScreen> {
barrierDismissible: true, // user must tap button! barrierDismissible: true, // user must tap button!
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: Text('Cancel Payment'.tr()), title: Text('Cancel Payment'.tr),
content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), content: SingleChildScrollView(child: Text("Cancel Payment?".tr)),
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
child: Text( child: Text(
'Cancel'.tr(), 'Cancel'.tr,
style: const TextStyle(color: Colors.red), style: const TextStyle(color: Colors.red),
), ),
onPressed: () { onPressed: () {
@@ -100,7 +100,7 @@ class _MercadoPagoScreenState extends State<MercadoPagoScreen> {
), ),
TextButton( TextButton(
child: Text( child: Text(
'Continue'.tr(), 'Continue'.tr,
style: const TextStyle(color: Colors.green), style: const TextStyle(color: Colors.green),
), ),
onPressed: () { onPressed: () {

10
lib/payment/PayFastScreen.dart
View File

@@ -3,10 +3,10 @@
import 'dart:developer'; import 'dart:developer';
import 'package:customer/models/payment_model/pay_fast_model.dart'; import 'package:customer/models/payment_model/pay_fast_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
class PayFastScreen extends StatefulWidget { class PayFastScreen extends StatefulWidget {
@@ -91,10 +91,10 @@ class _PayFastScreenState extends State<PayFastScreen> {
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: const Text('Cancel Payment'), title: const Text('Cancel Payment'),
content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), content: SingleChildScrollView(child: Text("Cancel Payment?".tr)),
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
child: Text('Exit'.tr(), style: TextStyle(color: Colors.red)), child: Text('Exit'.tr, style: TextStyle(color: Colors.red)),
onPressed: () { onPressed: () {
Get.back(); Get.back();
Get.back(result: false); Get.back(result: false);
@@ -102,7 +102,7 @@ class _PayFastScreenState extends State<PayFastScreen> {
), ),
TextButton( TextButton(
child: Text( child: Text(
'Continue Payment'.tr(), 'Continue Payment'.tr,
style: TextStyle(color: Colors.green), style: TextStyle(color: Colors.green),
), ),
onPressed: () { onPressed: () {

11
lib/payment/midtrans_screen.dart
View File

@@ -2,9 +2,8 @@ import 'dart:async';
import 'dart:developer'; import 'dart:developer';
import 'dart:io'; import 'dart:io';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
class MidtransScreen extends StatefulWidget { class MidtransScreen extends StatefulWidget {
@@ -104,12 +103,12 @@ class _MidtransScreenState extends State<MidtransScreen> {
barrierDismissible: true, // user must tap button! barrierDismissible: true, // user must tap button!
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: Text('Cancel Payment'.tr()), title: Text('Cancel Payment'.tr),
content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), content: SingleChildScrollView(child: Text("Cancel Payment?".tr)),
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
child: Text( child: Text(
'Cancel'.tr(), 'Cancel'.tr,
style: const TextStyle(color: Colors.red), style: const TextStyle(color: Colors.red),
), ),
onPressed: () { onPressed: () {
@@ -119,7 +118,7 @@ class _MidtransScreenState extends State<MidtransScreen> {
), ),
TextButton( TextButton(
child: Text( child: Text(
'Continue'.tr(), 'Continue'.tr,
style: const TextStyle(color: Colors.green), style: const TextStyle(color: Colors.green),
), ),
onPressed: () { onPressed: () {

22
lib/payment/orangePayScreen.dart
View File

@@ -3,9 +3,9 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:customer/models/payment_model/orange_money.dart'; import 'package:customer/models/payment_model/orange_money.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
@@ -140,7 +140,7 @@ class _OrangeMoneyScreenState extends State<OrangeMoneyScreen> {
icon: const Icon(Icons.arrow_back, color: Colors.white), icon: const Icon(Icons.arrow_back, color: Colors.white),
onPressed: _showCancelDialog, onPressed: _showCancelDialog,
), ),
title: Text('Orange Money Payment'.tr()), title: Text('Orange Money Payment'.tr),
), ),
body: body:
isLoading isLoading
@@ -156,15 +156,15 @@ class _OrangeMoneyScreenState extends State<OrangeMoneyScreen> {
barrierDismissible: true, barrierDismissible: true,
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: Text('Cancel Payment'.tr()), title: Text('Cancel Payment'.tr),
content: Text('Are you sure you want to cancel this payment?'.tr()), content: Text('Are you sure you want to cancel this payment?'.tr),
actions: [ actions: [
TextButton( TextButton(
child: Text('No', style: TextStyle(color: Colors.green)), child: Text('No', style: TextStyle(color: Colors.green)),
onPressed: () => Get.back(), onPressed: () => Get.back(),
), ),
TextButton( TextButton(
child: Text('Yes'.tr(), style: TextStyle(color: Colors.red)), child: Text('Yes'.tr, style: TextStyle(color: Colors.red)),
onPressed: () { onPressed: () {
timer?.cancel(); timer?.cancel();
Get.back(); // close dialog Get.back(); // close dialog
@@ -190,7 +190,7 @@ class _OrangeMoneyScreenState extends State<OrangeMoneyScreen> {
// import 'dart:convert'; // import 'dart:convert';
// import 'package:customer/models/payment_model/orange_money.dart'; // import 'package:customer/models/payment_model/orange_money.dart';
// import 'package:flutter/material.dart'; // import 'package:flutter/material.dart';
// import 'package:get/get.dart' hide Trans;// import 'package:http/http.dart' as http; // import 'package:get/get.dart';// import 'package:http/http.dart' as http;
// import 'package:webview_flutter/webview_flutter.dart'; // import 'package:webview_flutter/webview_flutter.dart';
// //
// class OrangeMoneyScreen extends StatefulWidget { // class OrangeMoneyScreen extends StatefulWidget {
@@ -336,14 +336,14 @@ class _OrangeMoneyScreenState extends State<OrangeMoneyScreen> {
// barrierDismissible: true, // user must tap button! // barrierDismissible: true, // user must tap button!
// builder: (BuildContext context) { // builder: (BuildContext context) {
// return AlertDialog( // return AlertDialog(
// title: Text('Cancel Payment'.tr()), // title: Text('Cancel Payment'.tr),
// content: SingleChildScrollView( // content: SingleChildScrollView(
// child: Text("cancelPayment?".tr()), // child: Text("cancelPayment?".tr),
// ), // ),
// actions: <Widget>[ // actions: <Widget>[
// TextButton( // TextButton(
// child: Text( // child: Text(
// 'Cancel'.tr(), // 'Cancel'.tr,
// style: const TextStyle(color: Colors.red), // style: const TextStyle(color: Colors.red),
// ), // ),
// onPressed: () { // onPressed: () {
@@ -353,7 +353,7 @@ class _OrangeMoneyScreenState extends State<OrangeMoneyScreen> {
// ), // ),
// TextButton( // TextButton(
// child: Text( // child: Text(
// 'Continue'.tr(), // 'Continue'.tr,
// style: const TextStyle(color: Colors.green), // style: const TextStyle(color: Colors.green),
// ), // ),
// onPressed: () { // onPressed: () {

6
lib/payment/paystack/pay_stack_screen.dart
View File

@@ -2,9 +2,9 @@ import 'dart:async';
import 'package:customer/payment/paystack/paystack_url_genrater.dart'; import 'package:customer/payment/paystack/paystack_url_genrater.dart';
import 'package:customer/themes/app_them_data.dart'; import 'package:customer/themes/app_them_data.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
class PayStackScreen extends StatefulWidget { class PayStackScreen extends StatefulWidget {
@@ -95,7 +95,7 @@ class _PayStackScreenState extends State<PayStackScreen> {
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: AppThemeData.grey50, backgroundColor: AppThemeData.grey50,
title: Text("Payment".tr()), title: Text("Payment".tr),
centerTitle: false, centerTitle: false,
leading: GestureDetector( leading: GestureDetector(
onTap: () { onTap: () {

12
lib/payment/xenditScreen.dart
View File

@@ -3,9 +3,9 @@ import 'dart:convert';
import 'dart:developer'; import 'dart:developer';
import 'package:customer/payment/xenditModel.dart'; import 'package:customer/payment/xenditModel.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
@@ -127,12 +127,12 @@ class _XenditScreenState extends State<XenditScreen> {
barrierDismissible: true, // user must tap button! barrierDismissible: true, // user must tap button!
builder: (BuildContext context) { builder: (BuildContext context) {
return AlertDialog( return AlertDialog(
title: Text('Cancel Payment'.tr()), title: Text('Cancel Payment'.tr),
content: SingleChildScrollView(child: Text("Cancel Payment?".tr())), content: SingleChildScrollView(child: Text("Cancel Payment?".tr)),
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
child: Text( child: Text(
'Cancel'.tr(), 'Cancel'.tr,
style: const TextStyle(color: Colors.red), style: const TextStyle(color: Colors.red),
), ),
onPressed: () { onPressed: () {
@@ -142,7 +142,7 @@ class _XenditScreenState extends State<XenditScreen> {
), ),
TextButton( TextButton(
child: Text( child: Text(
'Continue'.tr(), 'Continue'.tr,
style: const TextStyle(color: Colors.green), style: const TextStyle(color: Colors.green),
), ),
onPressed: () { onPressed: () {

19
lib/screen_ui/auth_screens/forgot_password_screen.dart
View File

@@ -1,9 +1,10 @@
import 'package:customer/constant/const_texts.dart'; import 'package:customer/constant/const_texts.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import '../../controllers/forgot_password_controller.dart'; import '../../controllers/forgot_password_controller.dart';
import '../../controllers/theme_controller.dart'; import '../../controllers/theme_controller.dart';
import '../../themes/app_them_data.dart'; import '../../themes/app_them_data.dart';
@@ -38,7 +39,7 @@ class ForgotPasswordScreen extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Text(
ConstTexts.skip.tr(), ConstTexts.skip.tr,
style: AppThemeData.mediumTextStyle( style: AppThemeData.mediumTextStyle(
color: color:
isDark isDark
@@ -74,7 +75,7 @@ class ForgotPasswordScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
ConstTexts.enterYourregisteredEmail.tr(), ConstTexts.enterYourregisteredEmail.tr,
style: AppThemeData.boldTextStyle( style: AppThemeData.boldTextStyle(
fontSize: 24, fontSize: 24,
color: color:
@@ -85,14 +86,14 @@ class ForgotPasswordScreen extends StatelessWidget {
), ),
const SizedBox(height: 24), const SizedBox(height: 24),
TextFieldWidget( TextFieldWidget(
title: ConstTexts.emailAddress.tr(), title: ConstTexts.emailAddress.tr,
hintText: "abdusalom@gmail.com", hintText: "abdusalom@gmail.com",
controller: controller.emailEditingController.value, controller: controller.emailEditingController.value,
), ),
const SizedBox(height: 30), const SizedBox(height: 30),
RoundedButtonFill( RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
title: ConstTexts.sendLink.tr(), title: ConstTexts.sendLink.tr,
onPress: controller.forgotPassword, onPress: controller.forgotPassword,
color: color:
isDark isDark
@@ -112,7 +113,7 @@ class ForgotPasswordScreen extends StatelessWidget {
child: Center( child: Center(
child: Text.rich( child: Text.rich(
TextSpan( TextSpan(
text: ConstTexts.rememberPassword.tr(), text: ConstTexts.rememberPassword.tr,
style: AppThemeData.mediumTextStyle( style: AppThemeData.mediumTextStyle(
color: color:
isDark isDark
@@ -121,7 +122,7 @@ class ForgotPasswordScreen extends StatelessWidget {
), ),
children: [ children: [
TextSpan( TextSpan(
text: ConstTexts.login.tr(), text: ConstTexts.login.tr,
style: AppThemeData.mediumTextStyle( style: AppThemeData.mediumTextStyle(
color: AppThemeData.ecommerce300, color: AppThemeData.ecommerce300,
decoration: TextDecoration.underline, decoration: TextDecoration.underline,
@@ -130,7 +131,7 @@ class ForgotPasswordScreen extends StatelessWidget {
recognizer: recognizer:
TapGestureRecognizer() TapGestureRecognizer()
..onTap = () { ..onTap = () {
Get.offAll(() => const LoginScreen()); Get.offAll(LoginScreen());
}, },
), ),
], ],

33
lib/screen_ui/auth_screens/login_screen.dart
View File

@@ -3,7 +3,8 @@ import 'dart:io';
import 'package:customer/constant/const_texts.dart'; import 'package:customer/constant/const_texts.dart';
import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart'; import 'package:customer/screen_ui/auth_screens/sign_up_screen.dart';
import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart'; import 'package:customer/screen_ui/location_enable_screens/location_permission_screen.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:customer/utils/app_router.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -13,7 +14,7 @@ import '../../controllers/theme_controller.dart';
import '../../themes/app_them_data.dart'; import '../../themes/app_them_data.dart';
import '../../themes/round_button_fill.dart'; import '../../themes/round_button_fill.dart';
import '../../themes/text_field_widget.dart'; import '../../themes/text_field_widget.dart';
import 'package:get/get.dart' hide Trans; import 'package:get/get.dart';
import 'forgot_password_screen.dart'; import 'forgot_password_screen.dart';
import 'mobile_login_screen.dart'; import 'mobile_login_screen.dart';
@@ -38,7 +39,7 @@ class LoginScreen extends StatelessWidget {
child: Row( child: Row(
children: [ children: [
Text( Text(
ConstTexts.skip.tr(), ConstTexts.skip.tr,
style: AppThemeData.mediumTextStyle( style: AppThemeData.mediumTextStyle(
color: color:
isDark isDark
@@ -72,7 +73,7 @@ class LoginScreen extends StatelessWidget {
children: [ children: [
const SizedBox(height: 20), const SizedBox(height: 20),
Text( Text(
ConstTexts.loginToExplore.tr(), ConstTexts.loginToExplore.tr,
style: AppThemeData.boldTextStyle( style: AppThemeData.boldTextStyle(
fontSize: 24, fontSize: 24,
color: color:
@@ -83,15 +84,15 @@ class LoginScreen extends StatelessWidget {
), ),
const SizedBox(height: 24), const SizedBox(height: 24),
TextFieldWidget( TextFieldWidget(
title: ConstTexts.emailAddress.tr(), title: ConstTexts.emailAddress.tr,
hintText: "abdusalom@gmail.com", hintText: "abdusalom@gmail.com",
controller: controller.emailController.value, controller: controller.emailController.value,
focusNode: controller.emailFocusNode, focusNode: controller.emailFocusNode,
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
TextFieldWidget( TextFieldWidget(
title: ConstTexts.password.tr(), title: ConstTexts.password.tr,
hintText: ConstTexts.enterPassword.tr(), hintText: ConstTexts.enterPassword.tr,
controller: controller.passwordController.value, controller: controller.passwordController.value,
obscureText: controller.passwordVisible.value, obscureText: controller.passwordVisible.value,
focusNode: controller.passwordFocusNode, focusNode: controller.passwordFocusNode,
@@ -133,7 +134,7 @@ class LoginScreen extends StatelessWidget {
() => const ForgotPasswordScreen(), () => const ForgotPasswordScreen(),
), ),
child: Text( child: Text(
ConstTexts.forgotPassword.tr(), ConstTexts.forgotPassword.tr,
style: AppThemeData.semiBoldTextStyle( style: AppThemeData.semiBoldTextStyle(
color: AppThemeData.info400, color: AppThemeData.info400,
), ),
@@ -143,7 +144,7 @@ class LoginScreen extends StatelessWidget {
const SizedBox(height: 20), const SizedBox(height: 20),
RoundedButtonFill( RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
title: ConstTexts.login.tr(), title: ConstTexts.login.tr,
onPress: controller.loginWithEmail, onPress: controller.loginWithEmail,
color: color:
isDark isDark
@@ -168,7 +169,7 @@ class LoginScreen extends StatelessWidget {
), ),
const SizedBox(width: 15), const SizedBox(width: 15),
Text( Text(
ConstTexts.orContinueWith.tr(), ConstTexts.orContinueWith.tr,
style: AppThemeData.regularTextStyle( style: AppThemeData.regularTextStyle(
color: color:
isDark isDark
@@ -192,7 +193,7 @@ class LoginScreen extends StatelessWidget {
const SizedBox(height: 25), const SizedBox(height: 25),
RoundedButtonFill( RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
title: ConstTexts.mobileNumber.tr(), title: ConstTexts.mobileNumber.tr,
onPress: onPress:
() => Get.to(() => const MobileLoginScreen()), () => Get.to(() => const MobileLoginScreen()),
isRight: false, isRight: false,
@@ -218,7 +219,7 @@ class LoginScreen extends StatelessWidget {
Expanded( Expanded(
child: RoundedButtonFill( child: RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
title: ConstTexts.withGoogle.tr(), title: ConstTexts.withGoogle.tr,
textColor: textColor:
isDark isDark
? AppThemeData.grey100 ? AppThemeData.grey100
@@ -242,7 +243,7 @@ class LoginScreen extends StatelessWidget {
? Expanded( ? Expanded(
child: RoundedButtonFill( child: RoundedButtonFill(
borderRadius: 10.r, borderRadius: 10.r,
title: ConstTexts.withApple.tr(), title: ConstTexts.withApple.tr,
isCenter: true, isCenter: true,
textColor: textColor:
isDark isDark
@@ -273,7 +274,7 @@ class LoginScreen extends StatelessWidget {
child: Center( child: Center(
child: Text.rich( child: Text.rich(
TextSpan( TextSpan(
text: "${ConstTexts.dontHaveAccount.tr()} ", text: "${ConstTexts.dontHaveAccount.tr} ",
style: AppThemeData.mediumTextStyle( style: AppThemeData.mediumTextStyle(
color: color:
isDark isDark
@@ -282,7 +283,7 @@ class LoginScreen extends StatelessWidget {
), ),
children: [ children: [
TextSpan( TextSpan(
text: ConstTexts.signUp.tr(), text: ConstTexts.signUp.tr,
style: AppThemeData.mediumTextStyle( style: AppThemeData.mediumTextStyle(
color: AppThemeData.ecommerce300, color: AppThemeData.ecommerce300,
decoration: TextDecoration.underline, decoration: TextDecoration.underline,
@@ -290,7 +291,7 @@ class LoginScreen extends StatelessWidget {
recognizer: recognizer:
TapGestureRecognizer() TapGestureRecognizer()
..onTap = () { ..onTap = () {
Get.offAll(() => const SignUpScreen()); Get.offAll(SignUpScreen());
}, },
), ),
], ],

Some files were not shown because too many files have changed in this diff Show More