diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 108a024c1..ca4a48cca 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -35,13 +35,14 @@ {% endblock %} - {% if entries('advs').isEnabled('favs') %} diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index ba76e11fc..370ae9f40 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -146,6 +146,13 @@ class AdvsController extends PublicController $subCats = array(); $param = $this->requestHttp->toArray(); + if (!isset($param['country'])) { + $param['country'] = setting_value('visiosoft.module.advs::default_country'); + $useDefault = 1; + } else { + $useDefault = 0; + } + $searchedCountry = $param['country']; $countries = $this->country_repository->viewAll(); @@ -213,7 +220,7 @@ class AdvsController extends PublicController } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request', - 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList'); + 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'useDefault'); Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); diff --git a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js index d0945e473..dd77002f6 100644 --- a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js +++ b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js @@ -25,6 +25,15 @@ FindLocations = (id, table, typeDb, divId, paramName = null) => { }); }; +// Set selected country in the select menu +if (useDefault) { + $('#cities').empty(); + var table = "cities"; + var typeDb = 'parent_country_id'; + var id = searchedCountry; + var divId = "#cities"; + FindLocations(id, table, typeDb, divId); +} setLocations = (response, id, table, typeDb, divId, paramName) => { @@ -40,7 +49,7 @@ setLocations = (response, id, table, typeDb, divId, paramName) => { //Set Selected Option if (paramName != null) { if (divId == "#cities") { - $('#countries').val(searchParams.get('country')); + $('#countries').val(searchedCountry); $('#countries').select2(); $('#cities').val(findParam("city[]")); } else {