11/9/1
This commit is contained in:
Hamza-Ayed
@@ -3,6 +3,7 @@ import 'dart:io';
|
||||
|
||||
import 'package:SEFER/constant/info.dart';
|
||||
import 'package:SEFER/controller/firebase/firbase_messge.dart';
|
||||
import 'package:SEFER/controller/functions/add_error.dart';
|
||||
import 'package:SEFER/views/auth/login_page.dart';
|
||||
import 'package:SEFER/views/auth/sms_verfy_page.dart';
|
||||
import 'package:SEFER/views/widgets/my_dialog.dart';
|
||||
@@ -15,6 +16,7 @@ import 'package:SEFER/main.dart';
|
||||
import 'package:SEFER/views/home/map_page_passenger.dart';
|
||||
import 'package:location/location.dart';
|
||||
|
||||
import '../../print.dart';
|
||||
import '../functions/package_info.dart';
|
||||
|
||||
class LoginController extends GetxController {
|
||||
@@ -90,23 +92,22 @@ class LoginController extends GetxController {
|
||||
} else {
|
||||
var jsonDecoeded = jsonDecode(res);
|
||||
if (jsonDecoeded.isNotEmpty) {
|
||||
var d = jsonDecoeded['data'][0];
|
||||
if (jsonDecoeded['status'] == 'success' &&
|
||||
jsonDecoeded['data'][0]['verified'].toString() == '1') {
|
||||
d['verified'].toString() == '1') {
|
||||
//
|
||||
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
|
||||
box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
|
||||
box.write(BoxName.email, d['email']);
|
||||
box.write(BoxName.phone, d['phone']);
|
||||
box.write(BoxName.isTest, '1');
|
||||
box.write(BoxName.package, jsonDecoeded['data'][0]['package']);
|
||||
box.write(BoxName.promo, jsonDecoeded['data'][0]['promo']);
|
||||
box.write(BoxName.discount, jsonDecoeded['data'][0]['discount']);
|
||||
box.write(BoxName.validity, jsonDecoeded['data'][0]['validity']);
|
||||
box.write(BoxName.isInstall,
|
||||
jsonDecoeded['data'][0]['isInstall'] ?? 'none');
|
||||
box.write(BoxName.isGiftToken,
|
||||
jsonDecoeded['data'][0]['isGiftToken'] ?? 'none');
|
||||
box.write(BoxName.inviteCode,
|
||||
jsonDecoeded['data'][0]['inviteCode'] ?? 'none');
|
||||
box.write(BoxName.package, d['package']);
|
||||
box.write(BoxName.promo, d['promo']);
|
||||
box.write(BoxName.discount, d['discount']);
|
||||
box.write(BoxName.validity, d['validity']);
|
||||
box.write(BoxName.isInstall, d['isInstall'] ?? 'none');
|
||||
box.write(BoxName.isGiftToken, d['isGiftToken'] ?? 'none');
|
||||
box.write(BoxName.inviteCode, d['inviteCode'] ?? 'none');
|
||||
|
||||
var token = await CRUD().get(link: AppLink.getTokens, payload: {
|
||||
'passengerID': box.read(BoxName.passengerID).toString()
|
||||
@@ -114,11 +115,11 @@ class LoginController extends GetxController {
|
||||
if (token != 'failure') {
|
||||
if (jsonDecode(token)['data'][0]['token'] !=
|
||||
box.read(BoxName.tokenFCM)) {
|
||||
Get.put(FirebaseMessagesController())
|
||||
.sendNotificationToAnyWithoutData(
|
||||
Get.put(FirebaseMessagesController()).sendNotificationToDriverMAP(
|
||||
'token change'.tr,
|
||||
'change device'.tr,
|
||||
jsonDecode(token)['data'][0]['token'].toString(),
|
||||
[],
|
||||
'cancel.wav',
|
||||
);
|
||||
Future.delayed(const Duration(seconds: 1));
|
||||
@@ -153,10 +154,10 @@ class LoginController extends GetxController {
|
||||
Get.offAll(() => const MapPagePassenger());
|
||||
},
|
||||
);
|
||||
} else {
|
||||
print('same');
|
||||
}
|
||||
} // Logging to check if inviteCode is written correctly
|
||||
print("Invite Code in Box: ${box.read(BoxName.inviteCode)}");
|
||||
print("Is Install: ${box.read(BoxName.isInstall)}");
|
||||
|
||||
if (box.read(BoxName.inviteCode).toString() != 'none' &&
|
||||
box.read(BoxName.isInstall).toString() != '1') {
|
||||
@@ -171,15 +172,22 @@ class LoginController extends GetxController {
|
||||
middleText: "Your invite code was successfully applied!"
|
||||
.tr, // Automatically translates based on the current locale
|
||||
onConfirm: () {
|
||||
CRUD().post(link: AppLink.addPassengersPromo, payload: {
|
||||
"promoCode":
|
||||
'S-${box.read(BoxName.name).toString().split(' ')[0]}',
|
||||
"amount": '25',
|
||||
"passengerID": box.read(BoxName.passengerID).toString(),
|
||||
"description": 'promo first'
|
||||
});
|
||||
Get.offAll(() =>
|
||||
const MapPagePassenger()); // Navigate to MapPagePassenger after confirmation
|
||||
try {
|
||||
CRUD().post(link: AppLink.addPassengersPromo, payload: {
|
||||
"promoCode":
|
||||
'S-${box.read(BoxName.name).toString().split(' ')[0]}',
|
||||
"amount": '25',
|
||||
"passengerID": box.read(BoxName.passengerID).toString(),
|
||||
"description": 'promo first'
|
||||
});
|
||||
} catch (e) {
|
||||
addError(e.toString(),
|
||||
'passenger Invitation Used dialogu as promo line 185 login_controller');
|
||||
} finally {
|
||||
// Continue with the rest of your flow, regardless of errors
|
||||
// For example, navigate to the next page
|
||||
Get.offAll(() => const MapPagePassenger());
|
||||
}
|
||||
},
|
||||
textConfirm: "OK".tr, // Confirm button text
|
||||
);
|
||||
@@ -200,34 +208,6 @@ class LoginController extends GetxController {
|
||||
}
|
||||
}
|
||||
|
||||
// void adminDashboardOpen() async {
|
||||
// if (formKeyAdmin.currentState!.validate()) {
|
||||
// await DeviceInfoPlus.getDeviceInfo();
|
||||
// if (Platform.isAndroid) {
|
||||
// // var res = await CRUD().get(link: AppLink.getAdminUser, payload: {
|
||||
// // // 'device_number': DeviceInfoPlus.deviceData['serialNumber'].toString(),
|
||||
// // });
|
||||
// // var d = jsonDecode(res);
|
||||
// // // if (DeviceInfoPlus.deviceData['serialNumber'] ==
|
||||
// // d['message']['device_number']) {
|
||||
// Get.back();
|
||||
// Get.to(() => const AdminHomePage());
|
||||
// // }
|
||||
// }
|
||||
// if (Platform.isIOS) {
|
||||
// // var res = await CRUD().get(link: AppLink.getAdminUser, payload: {
|
||||
// // 'device_number': DeviceInfoPlus.deviceData['identifierForVendor'].toString(),
|
||||
// // });
|
||||
// // var d = jsonDecode(res);
|
||||
// // if (DeviceInfoPlus.deviceData['serialNumber'] ==
|
||||
// // d['message']['device_number']) {
|
||||
// Get.back();
|
||||
// Get.to(() => const AdminHomePage());
|
||||
// // }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
void login() async {
|
||||
isloading = true;
|
||||
update();
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'dart:math';
|
||||
|
||||
import 'package:SEFER/constant/colors.dart';
|
||||
import 'package:SEFER/controller/auth/login_controller.dart';
|
||||
import 'package:SEFER/controller/functions/add_error.dart';
|
||||
import 'package:SEFER/controller/local/phone_intel/phone_number.dart';
|
||||
import 'package:SEFER/views/home/map_page_passenger.dart';
|
||||
import 'package:SEFER/views/widgets/my_dialog.dart';
|
||||
@@ -134,66 +135,51 @@ class RegisterController extends GetxController {
|
||||
String phoneNumber = phoneController.text;
|
||||
|
||||
// Check if the phone number is from Egypt (Assuming Egyptian numbers start with +20)
|
||||
bool isEgyptianNumber = phoneNumber.startsWith('+20');
|
||||
// print('dfdf${phoneNumber.toString().split('+2')[1]}');
|
||||
if (isEgyptianNumber && phoneNumber.length == 13) {
|
||||
// Check if the phone number is already verified
|
||||
var responseChecker = await CRUD().post(
|
||||
link: AppLink.checkPhoneNumberISVerfiedPassenger,
|
||||
payload: {
|
||||
'phone_number': phoneNumber,
|
||||
'email': box.read(BoxName.email),
|
||||
},
|
||||
);
|
||||
|
||||
if (responseChecker != 'failure') {
|
||||
var data = jsonDecode(responseChecker);
|
||||
if (phoneController.text.isNotEmpty) {
|
||||
bool isEgyptianNumber = phoneNumber.startsWith('+20');
|
||||
if (isEgyptianNumber && phoneNumber.length == 13) {
|
||||
// Check if the phone number is already verified
|
||||
var responseChecker = await CRUD().post(
|
||||
link: AppLink.checkPhoneNumberISVerfiedPassenger,
|
||||
payload: {
|
||||
'phone_number': phoneNumber,
|
||||
'email': box.read(BoxName.email),
|
||||
},
|
||||
);
|
||||
|
||||
// If the phone number is already verified
|
||||
if (data['message'][0]['verified'].toString() == '1') {
|
||||
Get.snackbar('Phone number is verified before'.tr, '',
|
||||
backgroundColor: AppColor.greenColor);
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.phone, phoneNumber);
|
||||
Get.offAll(const MapPagePassenger());
|
||||
if (responseChecker != 'failure') {
|
||||
var data = jsonDecode(responseChecker);
|
||||
|
||||
// If the phone number is already verified
|
||||
if (data['message'][0]['verified'].toString() == '1') {
|
||||
Get.snackbar('Phone number is verified before'.tr, '',
|
||||
backgroundColor: AppColor.greenColor);
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.phone, phoneNumber);
|
||||
Get.offAll(const MapPagePassenger());
|
||||
} else {
|
||||
await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
|
||||
smsEgyptController);
|
||||
}
|
||||
} else {
|
||||
// If the phone number is not verified, send OTP
|
||||
// if (isEgyptianNumber) {
|
||||
// if (isValidEgyptianPhoneNumber(
|
||||
// phoneNumber.toString().split('+2')[1])) {
|
||||
await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
|
||||
smsEgyptController);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
} else {
|
||||
// If verification check fails, still send OTP
|
||||
// if (isEgyptianNumber) {
|
||||
// if (isValidEgyptianPhoneNumber(
|
||||
// phoneNumber.toString().split('+2')[1])) {
|
||||
await sendOtp(
|
||||
sendOtp(
|
||||
phoneNumber, randomNumber, isEgyptianNumber, smsEgyptController);
|
||||
// } else {
|
||||
// MyDialog().getDialog(
|
||||
// 'Error'.tr, "Phone number isn't an Egyptian phone number".tr,
|
||||
// () {
|
||||
// Get.back();
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
}
|
||||
} else {
|
||||
// MyDialog().getDialog(
|
||||
// 'Error'.tr, 'Phone number must be exactly 11 digits long'.tr, () {
|
||||
// Get.back();
|
||||
// });
|
||||
sendOtp(
|
||||
phoneNumber, randomNumber, isEgyptianNumber, smsEgyptController);
|
||||
print(phoneNumber);
|
||||
MyDialog().getDialog(
|
||||
'Error'.tr, 'Phone number must be exactly 11 digits long'.tr, () {
|
||||
Get.back();
|
||||
});
|
||||
// sendOtp(
|
||||
// phoneNumber, randomNumber, isEgyptianNumber, smsEgyptController);
|
||||
}
|
||||
} catch (e) {
|
||||
// Handle error
|
||||
print('Error: $e');
|
||||
} finally {
|
||||
isLoading = false;
|
||||
update();
|
||||
@@ -205,34 +191,14 @@ class RegisterController extends GetxController {
|
||||
SmsEgyptController controller) async {
|
||||
// Trim any leading or trailing whitespace from the phone number
|
||||
phoneNumber = phoneNumber.trim();
|
||||
Log.print('phoneNumber: ${phoneNumber}');
|
||||
|
||||
await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
|
||||
'phone_number': phoneNumber,
|
||||
'token': otp.toString(),
|
||||
});
|
||||
if (isEgyptian) {
|
||||
// // Check if the phone number has exactly 11 digits
|
||||
// if (phoneNumber.length == 11 &&
|
||||
// RegExp(r'^\d{11}$').hasMatch(phoneNumber)) {
|
||||
// Send SMS for Egyptian phone numbers
|
||||
await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
|
||||
'phone_number': phoneNumber,
|
||||
'token': otp.toString(),
|
||||
// 'urlImage': box.read(BoxName.passengerPhotoUrl),
|
||||
// 'name': box.read(BoxName.name),
|
||||
});
|
||||
|
||||
await controller.sendSmsEgypt(phoneNumber, otp.toString());
|
||||
print('SMS sent to Egyptian phone number: $phoneNumber');
|
||||
} else {
|
||||
// // Show error dialog if phone number is invalid
|
||||
// MyDialog().getDialog('Invalid Phone Number',
|
||||
// 'The phone number must be exactly 11 digits long.', () {
|
||||
// Get.back();
|
||||
// });
|
||||
// }
|
||||
|
||||
// else {
|
||||
// Send WhatsApp message for non-Egyptian phone numbers
|
||||
await CRUD().sendWhatsAppAuth(phoneNumber, otp.toString());
|
||||
print('WhatsApp message sent to non-Egyptian phone number: $phoneNumber');
|
||||
}
|
||||
isLoading = false;
|
||||
|
||||
@@ -243,98 +209,72 @@ class RegisterController extends GetxController {
|
||||
}
|
||||
|
||||
verifySMSCode() async {
|
||||
// if (formKey3.currentState!.validate()) {
|
||||
Log.print('phoneController.text: ${phoneController.text}');
|
||||
// if (isValidEgyptianPhoneNumber(phoneController.text)) {
|
||||
var res = await CRUD().post(link: AppLink.verifyOtpMessage, payload: {
|
||||
'phone_number': phoneController.text,
|
||||
'token': verifyCode.text.toString(),
|
||||
});
|
||||
if (res != 'failure') {
|
||||
// var dec = jsonDecode(res);
|
||||
box.write(BoxName.phoneDriver, phoneController.text);
|
||||
var payload = {
|
||||
'id': box.read(BoxName.passengerID),
|
||||
'phone': phoneController.text,
|
||||
'email': box.read(BoxName.email),
|
||||
'password': 'unknown',
|
||||
'gender': 'unknown',
|
||||
'birthdate': '2002-01-01',
|
||||
'site': box.read(BoxName.passengerPhotoUrl) ?? 'unknown',
|
||||
'first_name': box.read(BoxName.name).toString().split(' ')[0],
|
||||
'last_name': box.read(BoxName.name).toString().split(' ')[1],
|
||||
};
|
||||
try {
|
||||
if (formKey3.currentState!.validate()) {
|
||||
var res = await CRUD().post(link: AppLink.verifyOtpMessage, payload: {
|
||||
'phone_number': phoneController.text,
|
||||
'token': verifyCode.text.toString(),
|
||||
});
|
||||
|
||||
var res1 = await CRUD().post(
|
||||
link: AppLink.signUp,
|
||||
payload: payload,
|
||||
);
|
||||
if (res1 != 'failure') {
|
||||
CRUD().post(
|
||||
link: '${AppLink.seferAlexandriaServer}/auth/signup.php',
|
||||
payload: payload,
|
||||
);
|
||||
CRUD().post(
|
||||
link: '${AppLink.seferGizaServer}/auth/signup.php',
|
||||
payload: payload,
|
||||
);
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.isFirstTime, '0');
|
||||
box.write(BoxName.phone, phoneController.text);
|
||||
// Get.offAll(const MapPagePassenger());
|
||||
Get.put(LoginController()).loginUsingCredentials(
|
||||
box.read(BoxName.passengerID).toString(),
|
||||
box.read(BoxName.email).toString(),
|
||||
);
|
||||
if (res != 'failure') {
|
||||
box.write(BoxName.phoneDriver, phoneController.text);
|
||||
var nameParts = box.read(BoxName.name).toString().split(' ');
|
||||
var firstName = nameParts.isNotEmpty ? nameParts[0] : 'unknown';
|
||||
var lastName = nameParts.length > 1 ? nameParts[1] : 'unknown';
|
||||
|
||||
var payload = {
|
||||
'id': box.read(BoxName.passengerID),
|
||||
'phone': phoneController.text,
|
||||
'email': box.read(BoxName.email),
|
||||
'password': 'unknown',
|
||||
'gender': 'unknown',
|
||||
'birthdate': '2002-01-01',
|
||||
'site': box.read(BoxName.passengerPhotoUrl) ?? 'unknown',
|
||||
'first_name': firstName,
|
||||
'last_name': lastName,
|
||||
};
|
||||
|
||||
var res1 = await CRUD().post(
|
||||
link: AppLink.signUp,
|
||||
payload: payload,
|
||||
);
|
||||
|
||||
if (res1 != 'failure') {
|
||||
await CRUD().post(
|
||||
link: '${AppLink.seferAlexandriaServer}/auth/signup.php',
|
||||
payload: payload,
|
||||
);
|
||||
await CRUD().post(
|
||||
link: '${AppLink.seferGizaServer}/auth/signup.php',
|
||||
payload: payload,
|
||||
);
|
||||
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.isFirstTime, '0');
|
||||
box.write(BoxName.phone, phoneController.text);
|
||||
|
||||
Get.put(LoginController()).loginUsingCredentials(
|
||||
box.read(BoxName.passengerID).toString(),
|
||||
box.read(BoxName.email).toString(),
|
||||
);
|
||||
} else {
|
||||
Get.snackbar('Error'.tr,
|
||||
"The email or phone number is already registered.".tr,
|
||||
backgroundColor: Colors.redAccent);
|
||||
}
|
||||
} else {
|
||||
Get.snackbar('Error'.tr, "phone not verified".tr,
|
||||
backgroundColor: Colors.redAccent);
|
||||
}
|
||||
} else {
|
||||
Get.snackbar('Error'.tr, "you must insert token code".tr,
|
||||
backgroundColor: AppColor.redColor);
|
||||
}
|
||||
} else {
|
||||
Get.snackbar(
|
||||
'Error'.tr, "The email or phone number is already registered.".tr,
|
||||
} catch (e) {
|
||||
addError(e.toString(), 'passenger sign up ');
|
||||
Get.snackbar('Error'.tr, "Something went wrong. Please try again.".tr,
|
||||
backgroundColor: Colors.redAccent);
|
||||
}
|
||||
// } else {
|
||||
// var res = await CRUD().post(link: AppLink.verifyOtpMessage, payload: {
|
||||
// 'phone_number': phoneController.text,
|
||||
// 'token': verifyCode.text.toString(),
|
||||
// });
|
||||
// if (res != 'failure') {
|
||||
// // var dec = jsonDecode(res);
|
||||
// box.write(BoxName.phoneDriver, '+${phoneController.text}');
|
||||
// var payload = {
|
||||
// 'id': box.read(BoxName.passengerID),
|
||||
// 'phone': phoneController.text,
|
||||
// 'email': box.read(BoxName.email),
|
||||
// 'password': 'unknown',
|
||||
// 'gender': 'unknown',
|
||||
// 'birthdate': '2002-01-01',
|
||||
// 'site': 'unknown',
|
||||
// 'first_name': box.read(BoxName.name).toString().split(' ')[0],
|
||||
// 'last_name': box.read(BoxName.name).toString().split(' ')[1],
|
||||
// };
|
||||
|
||||
// var res1 = await CRUD().post(
|
||||
// link: AppLink.signUp,
|
||||
// payload: payload,
|
||||
// );
|
||||
// if (res1 != 'failure') {
|
||||
// CRUD().post(
|
||||
// link: '${AppLink.seferAlexandriaServer}/auth/signup.php',
|
||||
// payload: payload,
|
||||
// );
|
||||
// CRUD().post(
|
||||
// link: '${AppLink.seferGizaServer}/auth/signup.php',
|
||||
// payload: payload,
|
||||
// );
|
||||
// box.write(BoxName.isVerified, '1');
|
||||
// box.write(BoxName.phone, '+${phoneController.text}');
|
||||
// Get.offAll(const MapPagePassenger());
|
||||
// }
|
||||
// } else {
|
||||
// Get.snackbar(
|
||||
// 'Error'.tr, "The email or phone number is already registered.".tr,
|
||||
// backgroundColor: Colors.redAccent);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
sendVerifications() async {
|
||||
|
||||
Reference in New Issue
Block a user