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 ca4a48cca..f7dc858c0 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -42,7 +42,6 @@ {% 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 370ae9f40..f5ed48863 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -147,10 +147,15 @@ class AdvsController extends PublicController $param = $this->requestHttp->toArray(); if (!isset($param['country'])) { - $param['country'] = setting_value('visiosoft.module.advs::default_country'); - $useDefault = 1; + if (is_null(Cookie::get('country'))) { + $param['country'] = setting_value('visiosoft.module.advs::default_country'); + } else { + $param['country'] = Cookie::get('country'); + } } else { - $useDefault = 0; + if ($param['country'] != setting_value('visiosoft.module.advs::default_country')) { + Cookie::queue(Cookie::make('country', $param['country'], 84000)); + } } $searchedCountry = $param['country']; @@ -220,7 +225,7 @@ class AdvsController extends PublicController } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'textfields', 'checkboxes', 'request', - 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry', 'useDefault'); + 'user', 'userProfile', 'featured_advs', 'type', 'topfields', 'ranges', 'seenList', 'searchedCountry'); 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 dd77002f6..32bcb033b 100644 --- a/addons/default/visiosoft/base-theme/resources/js/filterLocation.js +++ b/addons/default/visiosoft/base-theme/resources/js/filterLocation.js @@ -26,7 +26,7 @@ FindLocations = (id, table, typeDb, divId, paramName = null) => { }; // Set selected country in the select menu -if (useDefault) { +if (searchParams.get('country') == null) { $('#cities').empty(); var table = "cities"; var typeDb = 'parent_country_id';