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 2901cb4b6..fc0770412 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
@@ -29,10 +29,6 @@
{% include 'visiosoft.theme.base::addons/anomaly/users-module/partials/register-form' %}
{% if setting_value('visiosoft.module.profile::show_checkbox_terms_on_register') %}
-
- {{ form.fields.accept_terms|raw }}
-
-
{{ form.fields.accept_protection_law|raw }}
diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
index c15a42369..97f5e1e5a 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
@@ -11,6 +11,8 @@ return [
'upload_avatar',
'show_tax_office',
'show_checkbox_terms_on_register',
+ 'register_protection_url',
+ 'register_privacy_url',
'show_education_profession',
'education',
'state_of_education',
diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
index ef0446b69..ece1e2b5d 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
@@ -41,6 +41,18 @@ return [
'mode' => 'checkbox'
]
],
+ 'register_protection_url' => [
+ 'type' => 'anomaly.field_type.url',
+ 'config' => [
+ 'default_value' => '#',
+ ]
+ ],
+ 'register_privacy_url' => [
+ 'type' => 'anomaly.field_type.url',
+ 'config' => [
+ 'default_value' => '#',
+ ]
+ ],
'show_education_profession' => [
'type' => 'anomaly.field_type.boolean',
'config' => [
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
index 058257522..2f577d9ae 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
@@ -459,8 +459,8 @@ return [
// Register page
'accept_terms_label' => 'I accept the terms.',
- 'accept_protection_law_label' => 'I accept the terms of the Law on Protection of Personal Data.',
- 'accept_privacy_terms_label' => 'I accept privacy terms.',
+ 'accept_protection_law_label' => 'I accept the terms of the Law on Protection of Personal Data.',
+ 'accept_privacy_terms_label' => 'I accept privacy terms.',
'receive_sms_emails_label' => 'I want to receive e-mail & sms.',
// Register Type
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
index 6373b6ec9..05158ef00 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
@@ -14,6 +14,12 @@ return [
'name' => 'Show Checkbox Terms on Register',
'instructions' => 'Show the "Accept term", "protection law", "privacy term", "sms & emails" on the register form'
],
+ 'register_protection_url' => [
+ 'name' => 'Register Protection URL',
+ ],
+ 'register_privacy_url' => [
+ 'name' => 'Register Privacy URL',
+ ],
'show_education_profession' => [
'name' => 'Show Education and Profession Fields',
'instructions' => 'Show the "Education", "State of Education" and "Profession" on the profile edit page'
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
index c31a31b19..9f9722603 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
@@ -34,15 +34,8 @@ class Register2FormFields
if (setting_value('visiosoft.module.profile::show_checkbox_terms_on_register')) {
$register = array_merge($register, [
- "accept_terms" => [
- "type" => "anomaly.field_type.boolean",
- "config" => [
- "default_value" => false,
- "mode" => "checkbox",
- "label" => 'visiosoft.module.profile::field.accept_terms_label',
- ]
- ],
"accept_protection_law" => [
+ 'required' => true,
"type" => "anomaly.field_type.boolean",
"config" => [
"default_value" => false,
@@ -51,6 +44,7 @@ class Register2FormFields
]
],
"accept_privacy_terms" => [
+ 'required' => true,
"type" => "anomaly.field_type.boolean",
"config" => [
"default_value" => false,
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 cf49a76ab..fd43dc3ab 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -12,26 +12,10 @@ use Visiosoft\ProfileModule\Profile\Register2\Command\HandleAutomaticRegistratio
use Visiosoft\ProfileModule\Profile\Register2\Command\HandleEmailRegistration;
use Visiosoft\ProfileModule\Profile\Register2\Command\HandleManualRegistration;
-/**
- * Class RegisterFormHandler
- *
- * @link http://openclassify.com/
- * @author OpenClassify, Inc.
- * @author Visiosoft Inc
- */
class Register2FormHandler
{
-
use DispatchesJobs;
- /**
- * Handle the form.
- *
- * @param Dispatcher $events
- * @param UserRepositoryInterface $users
- * @param Register2FormBuilder $builder
- * @param UserActivator $activator
- */
public function handle(
Dispatcher $events,
UserRepositoryInterface $users,
@@ -59,7 +43,6 @@ class Register2FormHandler
$fields['gsm_phone'] = $builder->getPostValue('phone');
unset(
$fields['phone'],
- $fields['accept_terms'],
$fields['accept_protection_law'],
$fields['accept_privacy_terms'],
$fields['receive_sms_emails'],