Merge branch 'master' of https://github.com/openclassify/openclassify into master

addons/default/visiosoft/advs-module/resources/js/cats.js

@@ -35,7 +35,7 @@ $(document).ready(function () {
                             btn = '';
                             res.forEach(function (link) {
                                 btn += `
-                                    <input type="submit" data-pack-id="${link.packID}" class="btn-1 mb-2"
+                                    <input type="submit" data-pack-id="${link.packID}" class="btn-1 mb-2 text-wrap"
                                         value="${response['continueBtn']}` + ' ' + `(${link.price})" />
                                 `
                             })

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig

@@ -22,6 +22,22 @@
 
                     {% include 'visiosoft.theme.base::addons/anomaly/users-module/partials/register-form' %}
 
+                    <div class="col-12">
+                        {{ form.fields.accept_terms|raw }}
+                    </div>
+
+                    <div class="col-12">
+                        {{ form.fields.accept_protection_law|raw }}
+                    </div>
+
+                    <div class="col-12">
+                        {{ form.fields.accept_privacy_terms|raw }}
+                    </div>
+
+                    <div class="col-12">
+                        {{ form.fields.receive_sms_emails|raw }}
+                    </div>
+
                     <div class="col-12 row m-0">
                         <div class="col-6 pr-0 pl-1">
                             <button class="btn btn-sm btn-success py-2">

addons/default/visiosoft/profile-module/resources/lang/en/field.php

@@ -446,4 +446,10 @@ return [
     'edit_details' => 'Edit Details',
     'update' => 'Update',
     'change_password' => 'Change Password',
+
+    // 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.',
+    'receive_sms_emails_label' => 'I want to receive e-mail & sms.',
 ];

addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php

@@ -67,6 +67,42 @@ class Register2FormBuilder extends FormBuilder
         'password' => [
             'instructions' => false,
         ],
+        "accept_terms" => [
+            "type"   => "anomaly.field_type.boolean",
+            "required" => true,
+            "config" => [
+                "default_value" => false,
+                "mode"          => "checkbox",
+                "label"         => 'visiosoft.module.profile::field.accept_terms_label',
+            ]
+        ],
+        "accept_protection_law" => [
+            "type"   => "anomaly.field_type.boolean",
+            "required" => true,
+            "config" => [
+                "default_value" => false,
+                "mode"          => "checkbox",
+                "label"         => 'visiosoft.module.profile::field.accept_protection_law_label',
+            ]
+        ],
+        "accept_privacy_terms" => [
+            "type"   => "anomaly.field_type.boolean",
+            "required" => true,
+            "config" => [
+                "default_value" => false,
+                "mode"          => "checkbox",
+                "label"         => 'visiosoft.module.profile::field.accept_privacy_terms_label',
+            ]
+        ],
+        "receive_sms_emails" => [
+            "type"   => "anomaly.field_type.boolean",
+            "required" => true,
+            "config" => [
+                "default_value" => false,
+                "mode"          => "checkbox",
+                "label"         => 'visiosoft.module.profile::field.receive_sms_emails_label',
+            ]
+        ],
     ];
 
     /**

addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php

@@ -57,7 +57,13 @@ class Register2FormHandler
         $fields = $builder->getPostData();
         $fields['display_name'] = $fields['first_name'] . " " . $fields['last_name'];
         $fields['gsm_phone'] = $builder->getPostValue('phone');
-        unset($fields['phone']);
+        unset(
+            $fields['phone'],
+            $fields['accept_terms'],
+            $fields['accept_protection_law'],
+            $fields['accept_privacy_terms'],
+            $fields['receive_sms_emails']
+        );
 
         $register = $users->create($fields);
         $register->setAttribute('password', $fields['password']);