From e5f5ea0b627e5f159de611db7d5aeb357f61df28 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 13 Oct 2020 17:41:27 +0300 Subject: [PATCH] sign up country selection settings added --- .../resources/config/settings/sections.php | 2 +- .../resources/config/settings/settings.php | 22 ++++++++++++++++++- .../base-theme/resources/js/phonefield.js | 3 ++- .../users-module/partials/register-form.twig | 1 + 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php index 950b34146..e356e2b94 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php @@ -9,7 +9,7 @@ return [ 'fields' => [ 'home_page_sub_categories_limit', 'navigation_title', 'navigation_action', 'date_fields', 'price_fields', 'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn', - 'register_page_instruction_logo', 'register_page_alert_link' + 'register_page_instruction_logo', 'register_page_alert_link', 'enabled_countries' ], ], 'template' => [ diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index 791e3a74b..eb501c7ab 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -1,5 +1,5 @@ [ 'type' => 'anomaly.field_type.boolean', @@ -71,4 +71,24 @@ return [ 'style' => [ 'type' => 'anomaly.field_type.editor', ], + + 'enabled_countries' => [ + 'bind' => 'visiosoft.theme.base::countries.enabled', + 'env' => 'ADV_ENABLED_COUNTRIES', + 'type' => 'anomaly.field_type.select', + 'required' => false, + 'config' => [ + 'default_value' => function () { + return [config('visiosoft.theme.base::countries.default')]; + }, + 'options' => function () { + $array = \Visiosoft\LocationModule\Country\CountryModel::query()->get(); + $cur = array(); + foreach ($array as $key => $value) { + $cur[$value['abv']] = $value['name']; + } + return $cur; + }, + ], + ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index 66535c2a8..155532c75 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -1,4 +1,5 @@ function phoneMask(fields) { + var country = document.getElementById('country').innerText; var inputQueries = document.querySelectorAll(fields); inputQueries.forEach(function (inputQuery, key) { var iti = intlTelInput(inputQuery, { @@ -8,7 +9,7 @@ function phoneMask(fields) { geoIpLookup: function (success, failure) { $.get("https://ipinfo.io", function () { }, "jsonp").always(function (resp) { - var countryCode = (resp && resp.country) ? resp.country : ""; + var countryCode = country ? country : (resp && resp.country) ? resp.country : ""; success(countryCode); }) } diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig index c63a55cb9..df0c260db 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig @@ -56,6 +56,7 @@
{{ form.fields.phone.setValue(form.fields.phone.value).input|raw }} +