From 02e10a5833c13dd21ceb2aaf88044f64fec7bcbd Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Fri, 6 Nov 2020 15:02:20 +0300
Subject: [PATCH 1/5] #2600 e-madencilik register error

---
 .../addons/anomaly/users-module/register.twig | 26 ++++---
 .../resources/config/settings/sections.php    |  2 +-
 .../resources/config/settings/settings.php    |  7 ++
 .../resources/lang/en/setting.php             |  4 +
 .../Profile/Register2/Register2FormFields.php | 73 ++++++++++---------
 5 files changed, 63 insertions(+), 49 deletions(-)

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 6d8a34eb4..f2d8dd128 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
@@ -28,21 +28,23 @@
 
                     {% include 'visiosoft.theme.base::addons/anomaly/users-module/partials/register-form' %}
 
-                    <div class="col-12">
-                        {{ form.fields.accept_terms|raw }}
-                    </div>
+                    {% 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>
+                        <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.accept_privacy_terms|raw }}
+                        </div>
 
-                    <div class="col-12">
-                        {{ form.fields.receive_sms_emails|raw }}
-                    </div>
+                        <div class="col-12">
+                            {{ form.fields.receive_sms_emails|raw }}
+                        </div>
+                    {% endif %}
 
                     <div class="col-12 row m-0">
                         <div class="col-6 pr-0 pl-1">
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 824048352..c13213f29 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
@@ -7,7 +7,7 @@ return [
             'general_setting' => [
                 'title' => 'visiosoft.module.profile::section.general_setting',
                 'fields' => [
-                    'show_my_ads', 'upload_avatar', 'show_tax_office'
+                    'show_my_ads', 'upload_avatar', 'show_tax_office', 'show_checkbox_terms_on_register'
                 ],
             ],
             'recaptcha' => [
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 f9bea65e9..f3f04357f 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
@@ -34,4 +34,11 @@ return [
             "max"       => 1.0,
         ]
     ],
+    'show_checkbox_terms_on_register' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+            'mode' => 'checkbox'
+        ]
+    ],
 ];
\ No newline at end of file
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 9c1e08a97..31a80386a 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
@@ -10,6 +10,10 @@ return [
     'show_tax_office' => [
         'name' => 'Show Tax Office Field',
     ],
+    'show_checkbox_terms_on_register' => [
+        'name' => 'Show Checkbox Terms on Register',
+        'instructions' => 'Show the "Accept term", "protection law", "privacy term", "sms & emails" on the register form'
+    ],
     'google_captcha_site_key' => [
         'name' => 'Google Captcha Site Key',
     ],
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 7e8d3ed54..248e66846 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
@@ -32,6 +32,43 @@ 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" => [
+                    "type"   => "anomaly.field_type.boolean",
+                    "config" => [
+                        "default_value" => false,
+                        "mode"          => "checkbox",
+                        "label"         => 'visiosoft.module.profile::field.accept_protection_law_label',
+                    ]
+                ],
+                "accept_privacy_terms" => [
+                    "type"   => "anomaly.field_type.boolean",
+                    "config" => [
+                        "default_value" => false,
+                        "mode"          => "checkbox",
+                        "label"         => 'visiosoft.module.profile::field.accept_privacy_terms_label',
+                    ]
+                ],
+                "receive_sms_emails" => [
+                    "type"   => "anomaly.field_type.boolean",
+                    "config" => [
+                        "default_value" => false,
+                        "mode"          => "checkbox",
+                        "label"         => 'visiosoft.module.profile::field.receive_sms_emails_label',
+                    ]
+                ],
+            ]);
+        }
+
         $builder->setFields(
             array_merge(
                 $register,
@@ -66,42 +103,6 @@ class Register2FormFields
                     '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',
-                        ]
-                    ],
                 ]
             )
         );

From 808c44476c5ef0ec52230123823e8a560f5c1e2b Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Fri, 6 Nov 2020 15:55:07 +0300
Subject: [PATCH 2/5] #2481 admin product options error

---
 .../visiosoft/advs-module/src/AdvsModuleServiceProvider.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 3fd214124..02f159114 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -210,7 +210,8 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
 		    'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@confAddCart',
 	    ],
 
-
+        // Admin ProductoptionsController
+        'admin/advs/product_options' => 'Visiosoft\AdvsModule\Http\Controller\Admin\ProductoptionsController@index'
     ];
 
     protected $middleware = [

From 55277e990f55a936ccde7a00b401a936e4e386da Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Fri, 6 Nov 2020 16:22:56 +0300
Subject: [PATCH 3/5] #2481 admin product options error

---
 .../visiosoft/advs-module/src/AdvsModuleServiceProvider.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 02f159114..1fc9eaecd 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -211,7 +211,9 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
 	    ],
 
         // Admin ProductoptionsController
-        'admin/advs/product_options' => 'Visiosoft\AdvsModule\Http\Controller\Admin\ProductoptionsController@index'
+        'admin/advs/product_options' => 'Visiosoft\AdvsModule\Http\Controller\Admin\ProductoptionsController@index',
+        'admin/advs/product_options/create' => 'Visiosoft\AdvsModule\Http\Controller\Admin\ProductoptionsController@create',
+        'admin/advs/product_options/edit/{id}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\ProductoptionsController@edit',
     ];
 
     protected $middleware = [

From 14e9e47e094c2943c395bf8d4a4e13f132b866e8 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Fri, 6 Nov 2020 18:32:17 +0300
Subject: [PATCH 4/5] #2594 e-madencilik add 3 fields to profile

---
 ...eate_profession_and_educational_fields.php | 69 +++++++++++++++++++
 .../resources/assets/css/profile.scss         |  4 ++
 .../resources/config/settings/sections.php    |  6 +-
 .../resources/config/settings/settings.php    |  7 ++
 .../resources/lang/en/field.php               |  9 +++
 .../resources/lang/en/setting.php             |  4 ++
 .../resources/views/profile/detail.twig       | 27 ++++++++
 .../Profile/Profile/ProfileFormBuilder.php    |  3 +
 .../Profile/Profile/ProfileFormHandler.php    |  8 +++
 9 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php

diff --git a/addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php b/addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php
new file mode 100644
index 000000000..8aacbfd2d
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php
@@ -0,0 +1,69 @@
+<?php
+
+use Anomaly\Streams\Platform\Database\Migration\Migration;
+
+class VisiosoftModuleProfileCreateProfessionAndEducationalFields extends Migration
+{
+
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if ($stream = $this->streams()->findBySlugAndNamespace('users', 'users')) {
+            $fields = [
+                [
+                    'name' => trans('visiosoft.module.profile::field.education.name'),
+                    'slug' => 'education',
+                ],
+                [
+                    'name' => trans('visiosoft.module.profile::field.state_of_education.name'),
+                    'slug' => 'state_of_education',
+                ],
+                [
+                    'name' => trans('visiosoft.module.profile::field.profession.name'),
+                    'slug' => 'profession',
+                ],
+            ];
+
+            foreach ($fields as $field) {
+                $exists = $this->fields()
+                    ->newQuery()
+                    ->where('slug', $field['slug'])
+                    ->where('namespace', 'users')
+                    ->first();
+
+                if (!$exists) {
+                    $userField = $this->fields()->create([
+                        'name' => $field['name'],
+                        'namespace' => 'users',
+                        'slug' => $field['slug'],
+                        'type' => 'anomaly.field_type.tags',
+                        'locked' => 0,
+                    ]);
+
+                    $this->assignments()->create([
+                        'stream_id' => $stream->id,
+                        'field_id' => $userField->id
+                    ]);
+                }
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        /*
+         * I never go back on my word!
+         * That's my nindo: my ninja way!
+         * NARUTO
+         */
+    }
+}
diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss
index 53e3144ce..3dafb014d 100644
--- a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss
+++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss
@@ -141,5 +141,9 @@
 		.birthday-field .input-group-addon {
 			display: none;
 		}
+
+		.education-field > .tagify, .state_of_education-field > .tagify, .profession-field > .tagify {
+			height: initial;
+		}
 	}
 }
\ No newline at end of file
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 c13213f29..00bad9616 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
@@ -7,7 +7,11 @@ return [
             'general_setting' => [
                 'title' => 'visiosoft.module.profile::section.general_setting',
                 'fields' => [
-                    'show_my_ads', 'upload_avatar', 'show_tax_office', 'show_checkbox_terms_on_register'
+                    'show_my_ads',
+                    'upload_avatar',
+                    'show_tax_office',
+                    'show_checkbox_terms_on_register',
+                    'show_education_profession'
                 ],
             ],
             'recaptcha' => [
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 f3f04357f..2dcdef450 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
@@ -41,4 +41,11 @@ return [
             'mode' => 'checkbox'
         ]
     ],
+    'show_education_profession' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+            'mode' => 'checkbox'
+        ]
+    ],
 ];
\ No newline at end of file
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 e11c7c876..13b390085 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
@@ -58,6 +58,15 @@ return [
     'birthday' => [
         'name' => 'Birthday'
     ],
+    'education' => [
+        'name' => 'Education'
+    ],
+    'state_of_education' => [
+        'name' => 'State of Education'
+    ],
+    'profession' => [
+        'name' => 'Profession'
+    ],
     'identification_number' => [
         'name' => 'Identification Number'
     ],
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 31a80386a..15cb14e7d 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,10 @@ return [
         'name' => 'Show Checkbox Terms on Register',
         'instructions' => 'Show the "Accept term", "protection law", "privacy term", "sms & emails" on the register form'
     ],
+    'show_education_profession' => [
+        'name' => 'Show Education and Profession Fields',
+        'instructions' => 'Show the "Education", "State of Education" and "Profession" on the profile edit page'
+    ],
     'google_captcha_site_key' => [
         'name' => 'Google Captcha Site Key',
     ],
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
index edde92e0b..9b782ebc8 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
@@ -149,6 +149,33 @@
                                         {{ profileForm.fields.birthday.input|raw }}
                                     </div>
                                 </div>
+
+                                {% if setting_value('visiosoft.module.profile::show_education_profession') %}
+                                    <div class="col-md-12">
+                                        <div class="form-group education-field">
+                                            <label class="control-label font-weight-bold">
+                                                {{ trans("visiosoft.module.profile::field.education.name") }}
+                                            </label>
+                                            {{ profileForm.fields.education.input|raw }}
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12">
+                                        <div class="form-group state_of_education-field">
+                                            <label class="control-label font-weight-bold">
+                                                {{ trans("visiosoft.module.profile::field.state_of_education.name") }}
+                                            </label>
+                                            {{ profileForm.fields.state_of_education.input|raw }}
+                                        </div>
+                                    </div>
+                                    <div class="col-md-12">
+                                        <div class="form-group profession-field">
+                                            <label class="control-label font-weight-bold">
+                                                {{ trans("visiosoft.module.profile::field.profession.name") }}
+                                            </label>
+                                            {{ profileForm.fields.profession.input|raw }}
+                                        </div>
+                                    </div>
+                                {% endif %}
                                 <div class="col-md-12">
                                     <div class="form-group">
                                         <label class="control-label font-weight-bold">
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
index a64e538b5..b005cf522 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
@@ -13,6 +13,9 @@ class ProfileFormBuilder extends FormBuilder
         'office_phone',
         'land_phone',
         'identification_number',
+        'education',
+        'state_of_education',
+        'profession',
         'birthday',
         'register_type'
     ];
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
index aae2f88f6..1b98c239f 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
@@ -25,6 +25,14 @@ class ProfileFormHandler
             'register_type' => $builder->getPostValue('register_type'),
         ];
 
+        if (setting_value('visiosoft.module.profile::show_education_profession')) {
+            $parameters = array_merge($parameters, [
+                'education' => $builder->getPostValue('education'),
+                'state_of_education' => $builder->getPostValue('state_of_education'),
+                'profession' => $builder->getPostValue('profession'),
+            ]);
+        }
+
         if ($builder->getPostValue('file') != null) {
             $parameters['file_id'] = $builder->getPostValue('file');
         } elseif (empty($builder->getPostValue('file'))) {

From aeff1f4f4ef6d090ab172dfa0fecee4f08a7fcf4 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Fri, 6 Nov 2020 18:55:18 +0300
Subject: [PATCH 5/5] #2594 e-madencilik add 3 fields to profile

---
 ...ate_profession_and_educational_fields.php} |  7 +---
 .../resources/config/settings/sections.php    |  5 ++-
 .../resources/config/settings/settings.php    |  3 ++
 .../resources/lang/en/setting.php             |  9 +++++
 .../resources/views/profile/detail.twig       | 37 +++++++++++++++++--
 5 files changed, 51 insertions(+), 10 deletions(-)
 rename addons/default/visiosoft/profile-module/migrations/{2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php => 2020_11_06_154603_visiosoft.module.profile__create_profession_and_educational_fields.php} (93%)

diff --git a/addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php b/addons/default/visiosoft/profile-module/migrations/2020_11_06_154603_visiosoft.module.profile__create_profession_and_educational_fields.php
similarity index 93%
rename from addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php
rename to addons/default/visiosoft/profile-module/migrations/2020_11_06_154603_visiosoft.module.profile__create_profession_and_educational_fields.php
index 8aacbfd2d..425ce5ae6 100644
--- a/addons/default/visiosoft/profile-module/migrations/2020_11_06_150519_visiosoft.module.profile__create_profession_and_educational_fields.php
+++ b/addons/default/visiosoft/profile-module/migrations/2020_11_06_154603_visiosoft.module.profile__create_profession_and_educational_fields.php
@@ -5,11 +5,6 @@ use Anomaly\Streams\Platform\Database\Migration\Migration;
 class VisiosoftModuleProfileCreateProfessionAndEducationalFields extends Migration
 {
 
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
     public function up()
     {
         if ($stream = $this->streams()->findBySlugAndNamespace('users', 'users')) {
@@ -40,7 +35,7 @@ class VisiosoftModuleProfileCreateProfessionAndEducationalFields extends Migrati
                         'name' => $field['name'],
                         'namespace' => 'users',
                         'slug' => $field['slug'],
-                        'type' => 'anomaly.field_type.tags',
+                        'type' => 'anomaly.field_type.text',
                         'locked' => 0,
                     ]);
 
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 00bad9616..c15a42369 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
@@ -11,7 +11,10 @@ return [
                     'upload_avatar',
                     'show_tax_office',
                     'show_checkbox_terms_on_register',
-                    'show_education_profession'
+                    'show_education_profession',
+                    'education',
+                    'state_of_education',
+                    'profession',
                 ],
             ],
             'recaptcha' => [
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 2dcdef450..ef0446b69 100644
--- a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
@@ -48,4 +48,7 @@ return [
             'mode' => 'checkbox'
         ]
     ],
+    "education" => "anomaly.field_type.tags",
+    "state_of_education" => "anomaly.field_type.tags",
+    "profession" => "anomaly.field_type.tags",
 ];
\ No newline at end of file
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 15cb14e7d..6373b6ec9 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
@@ -28,4 +28,13 @@ return [
         'name' => 'Score Threshold',
         'instructions' => 'A value between 0 and 1. The higher the threshold the more strict ReCaptcha is in trying to determine if a user is a bot or not.',
     ],
+    'education' => [
+        'name' => 'Education'
+    ],
+    'state_of_education' => [
+        'name' => 'State of Education'
+    ],
+    'profession' => [
+        'name' => 'Profession'
+    ],
 ];
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
index 9b782ebc8..81e7820ec 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
@@ -156,7 +156,18 @@
                                             <label class="control-label font-weight-bold">
                                                 {{ trans("visiosoft.module.profile::field.education.name") }}
                                             </label>
-                                            {{ profileForm.fields.education.input|raw }}
+                                            {{ profileForm.fields.education.value.input|raw }}
+                                            <select name="education" class="custom-select form-control"
+                                                    data-field="education" data-field_name="education"
+                                                    data-provides="anomaly.field_type.select" id="education">
+                                                <option value="">Choose an option...</option>
+                                                {% for education in setting_value('visiosoft.module.profile::education') %}
+                                                    <option value="{{ education }}"
+                                                            {{ profileForm.fields.education.value == education ? 'selected' }}>
+                                                        {{ education }}
+                                                    </option>
+                                                {% endfor %}
+                                            </select>
                                         </div>
                                     </div>
                                     <div class="col-md-12">
@@ -164,7 +175,17 @@
                                             <label class="control-label font-weight-bold">
                                                 {{ trans("visiosoft.module.profile::field.state_of_education.name") }}
                                             </label>
-                                            {{ profileForm.fields.state_of_education.input|raw }}
+                                            <select name="state_of_education" class="custom-select form-control"
+                                                    data-field="state_of_education" data-field_name="state_of_education"
+                                                    data-provides="anomaly.field_type.select" id="state_of_education">
+                                                <option value="">Choose an option...</option>
+                                                {% for state_of_education in setting_value('visiosoft.module.profile::state_of_education') %}
+                                                    <option value="{{ state_of_education }}"
+                                                            {{ profileForm.fields.state_of_education.value == state_of_education ? 'selected' }}>
+                                                        {{ state_of_education }}
+                                                    </option>
+                                                {% endfor %}
+                                            </select>
                                         </div>
                                     </div>
                                     <div class="col-md-12">
@@ -172,7 +193,17 @@
                                             <label class="control-label font-weight-bold">
                                                 {{ trans("visiosoft.module.profile::field.profession.name") }}
                                             </label>
-                                            {{ profileForm.fields.profession.input|raw }}
+                                            <select name="profession" class="custom-select form-control"
+                                                    data-field="profession" data-field_name="profession"
+                                                    data-provides="anomaly.field_type.select" id="profession">
+                                                <option value="">Choose an option...</option>
+                                                {% for profession in setting_value('visiosoft.module.profile::profession') %}
+                                                    <option value="{{ profession }}"
+                                                            {{ profileForm.fields.profession.value == profession ? 'selected' }}>
+                                                        {{ profession }}
+                                                    </option>
+                                                {% endfor %}
+                                            </select>
                                         </div>
                                     </div>
                                 {% endif %}