diff --git a/addons/default/visiosoft/advs-module/resources/css/list-new.scss b/addons/default/visiosoft/advs-module/resources/css/list-new.scss index 6d65b7e39..f039dc2f2 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list-new.scss +++ b/addons/default/visiosoft/advs-module/resources/css/list-new.scss @@ -55,8 +55,12 @@ ul { } } - & > label { - font-size: calc(14rem / 16); + &:last-child { + max-height: 11rem; + + label { + font-size: calc(14rem / 16); + } } } } @@ -513,13 +517,13 @@ ul { } .cat-data { - font-size: calc(12rem / 16); + font-size: calc(13rem / 16); color: rgba(34, 34, 34, .4); } .action-data { color: #A1A1A1; - font-size: calc(8rem / 16); + font-size: calc(10.7rem / 16); & > a { visibility: hidden; @@ -541,7 +545,7 @@ ul { } svg { - width: .4rem; + width: .45rem; height: auto; } } 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 4e3546423..0128df3ef 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -49,7 +49,7 @@ {% endfor %}
- {{ trans('visiosoft.module.advs::field.clear_all') }} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 8aa9d7415..48a2cb3cd 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -56,26 +56,28 @@ {{ img('visiosoft.module.advs::images/listing/filter-arrow.svg').data|raw }}
-
- - -
-
- - -
-
- - +
+
+ + +
+
+ + +
+
+ + +
@@ -89,19 +91,21 @@ {{ img('visiosoft.module.advs::images/listing/filter-arrow.svg').data|raw }} -
- - -
-
- - +
+
+ + +
+
+ + +
@@ -115,10 +119,12 @@ {{ img('visiosoft.module.advs::images/listing/filter-arrow.svg').data|raw }} -
- - +
+
+ + +
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 599e98b56..ea6af9304 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -360,6 +360,38 @@ class AdvsController extends PublicController ]; } + if (($cities = \request()->city) && $cities = $cities[0]) { + $citiesIDs = $cityId ? [$cityId->id] : explode(',', $cities); + $cities = $this->cityRepository->findAllByIDs($citiesIDs); + + $value = array(); + foreach ($cities as $city) { + $removalLink = array_filter($param, function ($singleParam) { + return $singleParam !== 'city'; + }, ARRAY_FILTER_USE_KEY); + $removalLink = fullLink( + $removalLink, + \request()->url(), + ['city[]' => implode( + ',', + array_filter($citiesIDs, function ($singleCity) use ($city) { + return $singleCity != $city->id; + }) + )] + ); + + $value[] = [ + 'name' => $city->name, + 'removalLink' => $removalLink + ]; + } + + $cFArray[] = [ + 'name' => trans('visiosoft.module.advs::field.address'), + 'value' => $value + ]; + } + Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); $viewType = $this->requestHttp->cookie('viewType'); diff --git a/addons/default/visiosoft/location-module/src/City/CityRepository.php b/addons/default/visiosoft/location-module/src/City/CityRepository.php index 9968eae76..2d55012f1 100644 --- a/addons/default/visiosoft/location-module/src/City/CityRepository.php +++ b/addons/default/visiosoft/location-module/src/City/CityRepository.php @@ -50,4 +50,10 @@ class CityRepository extends EntryRepository implements CityRepositoryInterface ->orderBy('order','ASC') ->get(); } + + public function findAllByIDs($citiesIDs) { + return $this->newQuery() + ->whereIn('location_cities.id', $citiesIDs) + ->get(); + } } diff --git a/addons/default/visiosoft/location-module/src/City/Contract/CityRepositoryInterface.php b/addons/default/visiosoft/location-module/src/City/Contract/CityRepositoryInterface.php index 9952563bd..2bd362f9a 100644 --- a/addons/default/visiosoft/location-module/src/City/Contract/CityRepositoryInterface.php +++ b/addons/default/visiosoft/location-module/src/City/Contract/CityRepositoryInterface.php @@ -7,4 +7,6 @@ interface CityRepositoryInterface extends EntryRepositoryInterface public function getByEntryIDsAndOrderByTransCol($entryIDs, $orderBy, $direction = 'asc'); public function getCitiesByCountryId($country_id); + + public function findAllByIDs($citiesIDs); } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php index 54ceeebcf..d48f7e590 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php @@ -4,6 +4,13 @@ class ForgotPassFormFields { public function handle(ForgotPassFormBuilder $builder) { + $resetTypeOptions = [ + 'mail' => 'visiosoft.theme.base::field.mail', + ]; + if (is_module_installed('visiosoft.module.sms')) { + $resetTypeOptions['sms'] = 'visiosoft.theme.base::field.sms'; + } + $builder->setFields( [ 'email' => [ @@ -23,10 +30,7 @@ class ForgotPassFormFields "resetType" => [ "type" => "anomaly.field_type.select", "config" => [ - "options" => [ - 'sms' => 'visiosoft.theme.base::field.sms', - 'mail' => 'visiosoft.theme.base::field.mail', - ], + "options" => $resetTypeOptions, "separator" => ":", "default_value" => 'mail', "mode" => "radio",