Merge pull request #813 from openclassify/dia

#2722 franchsepeti geliştirmeler

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') %}
-                        <div class="col-12">
-                            {{ form.fields.accept_terms|raw }}
-                        </div>
-
                         <div class="col-12">
                             {{ form.fields.accept_protection_law|raw }}
                         </div>

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',

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' => [

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 <a href="' . setting_value('visiosoft.module.profile::register_protection_url') . '" target="_blank">Protection of Personal Data.</a>',
+    'accept_privacy_terms_label' => 'I accept <a href="' . setting_value('visiosoft.module.profile::register_privacy_url') . '" target="_blank">privacy terms</a>.',
     'receive_sms_emails_label' => 'I want to receive e-mail & sms.',
 
     // Register Type

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'

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,

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. <support@openclassify.com>
- * @author Visiosoft Inc <support@openclassify.com>
- */
 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'],