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

9/15/2

Browse Source
This commit is contained in:
Hamza-Ayed
2024-09-15 12:53:55 +03:00
parent 9752d61230
commit ad7083f93a
9 changed files with 491 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

233
lib/controller/auth/register_controller.dart
View File

@@ -3,6 +3,7 @@ import 'dart:convert';
import 'dart:math';
import 'package:SEFER/constant/colors.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';
import 'package:flutter/material.dart';
@@ -116,7 +117,8 @@ class RegisterController extends GetxController {
sendOtpMessage() async {
SmsEgyptController smsEgyptController;
isLoading = true;
update();
try {
// Initialize SmsEgyptController
smsEgyptController = Get.put(SmsEgyptController());
@@ -156,27 +158,27 @@ class RegisterController extends GetxController {
} 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);
}
// 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(phoneNumber, randomNumber, isEgyptianNumber,
smsEgyptController);
} else {
MyDialog().getDialog(
'Error'.tr, "Phone number isn't an Egyptian phone number".tr,
() {
Get.back();
});
}
// if (isValidEgyptianPhoneNumber(
// phoneNumber.toString().split('+2')[1])) {
await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
smsEgyptController);
// } else {
// MyDialog().getDialog(
// 'Error'.tr, "Phone number isn't an Egyptian phone number".tr,
// () {
// Get.back();
// });
// }
}
}
} else {
@@ -205,30 +207,32 @@ class RegisterController extends GetxController {
Log.print('phoneNumber: ${phoneNumber}');
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(),
});
// // 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(),
});
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();
});
}
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;
update();
isSent = true;
remainingTime = 300; // Reset to 5 minutes
startTimer();
@@ -236,91 +240,92 @@ class RegisterController extends GetxController {
verifySMSCode() async {
// if (formKey3.currentState!.validate()) {
if (isValidEgyptianPhoneNumber(phoneController.text)) {
var res = await CRUD().post(link: AppLink.verifyOtpMessage, payload: {
'phone_number': '+2${phoneController.text}',
'token': verifyCode.text.toString(),
});
if (res != 'failure') {
// var dec = jsonDecode(res);
box.write(BoxName.phoneDriver, '+2${phoneController.text}');
var payload = {
'id': box.read(BoxName.passengerID),
'phone': '+2${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],
};
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': '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,
var res1 = await CRUD().post(
link: AppLink.signUp,
payload: payload,
);
if (res1 != 'failure') {
CRUD().post(
link: '${AppLink.seferAlexandriaServer}/auth/signup.php',
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, '+2${phoneController.text}');
Get.offAll(const MapPagePassenger());
}
} else {
Get.snackbar(
'Error'.tr, "The email or phone number is already registered.".tr,
backgroundColor: Colors.redAccent);
CRUD().post(
link: '${AppLink.seferGizaServer}/auth/signup.php',
payload: payload,
);
box.write(BoxName.isVerified, '1');
box.write(BoxName.phone, '+2${phoneController.text}');
Get.offAll(const MapPagePassenger());
}
} 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);
}
Get.snackbar(
'Error'.tr, "The email or phone number is already registered.".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 {

2
lib/controller/functions/sms_controller.dart
View File

@@ -34,7 +34,7 @@ class SmsEgyptController extends GetxController {
"message": "${AppInformation.appName} app code is $otp\ncopy it to app",
"language": box.read(BoxName.lang) == 'en' ? "e" : 'r',
"sender": sender, //"Sefer Egy",
"receiver": "2$phone"
"receiver": phone
});
var res = await http.post(

19
lib/views/auth/sms_verfy_page.dart
View File

@@ -9,6 +9,7 @@ import 'package:get/get.dart';
import '../../controller/local/phone_intel/intl_phone_field.dart';
import '../../print.dart';
import '../widgets/mycircular.dart';
// import 'package:intl_phone_field/intl_phone_field.dart';
class SmsSignupEgypt extends StatelessWidget {
@@ -96,14 +97,16 @@ class SmsSignupEgypt extends StatelessWidget {
),
),
// Submit button
MyElevatedButton(
onPressed: () async {
!registerController.isSent
? await registerController.sendOtpMessage()
: await registerController.verifySMSCode();
},
title: 'Submit'.tr,
),
registerController.isLoading
? const MyCircularProgressIndicator()
: MyElevatedButton(
onPressed: () async {
!registerController.isSent
? await registerController.sendOtpMessage()
: await registerController.verifySMSCode();
},
title: 'Submit'.tr,
),
],
);
}),