diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css
index 4255e2f76..1b6de2d92 100644
--- a/addons/default/visiosoft/base-theme/resources/css/theme.css
+++ b/addons/default/visiosoft/base-theme/resources/css/theme.css
@@ -19,9 +19,13 @@
width: 100%;
}
+.register-phone .iti--allow-dropdown {
+ width: 100%;
+}
+
@media only screen and (min-width: 960px) {
.login-section,
.register-section {
padding: 100px 50px;
}
-}
\ No newline at end of file
+}
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
index 4d31f24b8..672b0a049 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
@@ -18,7 +18,7 @@
-
@@ -58,12 +58,16 @@
- {{ form.fields.email.input|raw }}
+ {{ form.fields.email.setPlaceholder(trans('visiosoft.theme.base::field.email')).input|raw }}
{% else %}
- {{ form.fields.email.setValue(random()~"@example.com").setAttributes({
+ {% set domain = config('app.url')|replace({ ('https://'): '',('http://'): '',('/'): '/' }) %}
+ {% if domain == "localhost" %}
+ {% set domain = "example.com" %}
+ {% endif %}
+ {{ form.fields.email.setValue(random()~"@"~domain).setAttributes({
'class' :'hidden',
}).input|raw }}
{% endif %}
@@ -75,7 +79,7 @@
- {{ form.fields.password.input|raw }}
+ {{ form.fields.password.setPlaceholder(trans('visiosoft.theme.base::field.password')).input|raw }}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
index a339becc5..361b63cf8 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
@@ -41,6 +41,9 @@ class Register2FormBuilder extends FormBuilder
'username' => [
'required' => true,
],
+ 'full_phone' => [
+ 'type' => 'anomaly.field_type.text',
+ ],
'first_name' => [
'instructions' => false,
'required' => true,
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
index d5e53439e..fb12b6cbc 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -41,6 +41,7 @@ class Register2FormHandler
return;
}
+
$profile_parameters = array();
/* Create Profile in Register */
@@ -50,13 +51,15 @@ class Register2FormHandler
$domain = str_replace('/', '', $domain);
$domain = str_replace('www', '', $domain);
- $profile_parameters['gsm_phone'] = $builder->getPostValue('phone');
+ $profile_parameters['gsm_phone'] = $builder->getPostValue('full_phone');
if (!setting_value('visiosoft.module.advs::register_email_field')) {
$builder->setFormValue('email', $builder->getPostValue('username') . "@" . $domain);
}
$fields = $builder->getPostData();
+ $fields['display_name'] = $fields['first_name'] . " " . $fields['last_name'];
unset($fields['phone']);
+ unset($fields['full_phone']);
$register = $users->create($fields);
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php
index dfa476f9e..94468bcfd 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php
@@ -7,11 +7,11 @@ class ValidateRegister
{
public function handle(FormBuilder $builder, ProfileRepositoryInterface $profileRepository, $attribute, $value)
{
- if (!is_numeric($builder->getPostValue('phone'))) {
- $builder->addFormError('phone', trans('visiosoft.module.profile::message.error_valid_phone'));
+ if (!is_numeric($builder->getPostValue('full_phone'))) {
+ $builder->addFormError('full_phone', trans('visiosoft.module.profile::message.error_valid_phone'));
return false;
- } elseif (!is_null($profileRepository->findPhoneNumber($builder->getPostValue('phone')))) {
- $builder->addFormError('phone', trans('visiosoft.module.profile::message.registered_phone'));
+ } elseif (!is_null($profileRepository->findPhoneNumber($builder->getPostValue('full_phone')))) {
+ $builder->addFormError('full_phone', trans('visiosoft.module.profile::message.registered_phone'));
return false;
}
return true;