diff --git a/src/views/Register.vue b/src/views/Register.vue
index 6c1eaf3..8916aaf 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -144,9 +144,9 @@
-
+
{{ $t("this_is_not_a_valid_international_phone_number") }}
@@ -173,7 +173,7 @@
+ }}
@@ -369,6 +369,21 @@ let userdetails = ref({
phone: "",
address: { street: "", address2: "", city: "", zipcode: "" },
});
+function isPhoneOkay() {
+ if (userdetails.value.phone === "") {
+ return true
+ }
+ if (userdetails.value.phone.includes(" ")) {
+ return false
+ }
+ if (!userdetails.value.phone.includes("+")) {
+ return false
+ }
+ if (isMobilePhone(userdetails.value.phone)) {
+ return true
+ }
+ return false
+}
let provide_address = ref(false);
let agb_accepted = ref(false);
let data_confirmed = ref(false);
@@ -382,8 +397,7 @@ const state = reactive({
() =>
agb_accepted.value === true &&
data_confirmed.value === true &&
- (isMobilePhone(userdetails.value.phone) ||
- !userdetails.value.phone.trim()) &&
+ isPhoneOkay() &&
isEmail(userdetails.value.mail) &&
userdetails.value.firstname &&
userdetails.value.lastname &&
@@ -396,25 +410,23 @@ const state = reactive({
});
const toast = useToast();
function login() {
- userdetails = userdetails.value;
- if (userdetails?.phone === "" || isMobilePhone(userdetails.phone)) {
- if (isEmail(userdetails.mail)) {
+ // userdetails = userdetails.value;
+ if (isPhoneOkay()) {
+ if (isEmail(userdetails.value.mail)) {
let postdata = {
- email: userdetails.mail,
- firstname: userdetails.firstname,
- middlename: userdetails.middlename,
- lastname: userdetails.lastname,
+ email: userdetails.value.mail,
+ firstname: userdetails.value.firstname,
+ middlename: userdetails.value.middlename,
+ lastname: userdetails.value.lastname,
+ phone: userdetails.value.phone,
address: {},
};
- if (isMobilePhone(userdetails.phone)) {
- postdata.phone = userdetails.phone;
- }
if (provide_address.value === true) {
postdata.address = {
- address1: userdetails.address.street,
- address2: userdetails.address.address2 || "",
- city: userdetails.address.city,
- postalcode: userdetails.address.zipcode,
+ address1: userdetails.value.address.street,
+ address2: userdetails.value.address.address2 || "",
+ city: userdetails.value.address.city,
+ postalcode: userdetails.value.address.zipcode,
country: "DE",
};
}