diff --git a/addons/default/visiosoft/advs-module/resources/css/dropleft-edit.css b/addons/default/visiosoft/advs-module/resources/css/dropleft-edit.css index af5f24123..db1b38e2a 100644 --- a/addons/default/visiosoft/advs-module/resources/css/dropleft-edit.css +++ b/addons/default/visiosoft/advs-module/resources/css/dropleft-edit.css @@ -1,6 +1,6 @@ .dropleft-edit { right: 0; - top: 50%; + top: 40%; } .dropleft-edit button { transform: rotate(-90deg) translate(0, -100%); 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 00ed64d4c..588db4357 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 @@ -1,188 +1,188 @@ {% set formHtml %} -
- {% endset %} - {% if 'cat' in param|keys %} + +{% endset %} +{% if 'cat' in param|keys %} {% if not param['cat'] is empty %} - {% set catId = entries('cats', 'category').find(param['cat']) %} - {% set cityId = null %} - {% if 'city' in param|keys %} - {% set citiesArray = param['city'][0]|split(',') %} - {% if count(citiesArray) is same as(1) %} - {% set cityId = entries('location', 'cities').find(param['city'][0]) %} + {% set catId = entries('cats', 'category').find(param['cat']) %} + {% set cityId = null %} + {% if 'city' in param|keys %} + {% set citiesArray = param['city'][0]|split(',') %} + {% if count(citiesArray) is same as(1) %} + {% set cityId = entries('location', 'cities').find(param['city'][0]) %} + {% endif %} {% endif %} - {% endif %} - {% set formHtml %} - + {% set formHtml %} + {% endset %} - {% endif %} - {% endif %} - {{ formHtml }} -
- - -
-
-
+ {% endif %} +{% endif %} +{{ formHtml }} +
+ + +
+
+
- {{ addBlock('ads-list/partials/list-filter',{ - 'mainCats':mainCats, - 'subCats':subCats, - 'ranges':ranges, - 'checkboxes':checkboxes, - 'topfields' : topfields, - 'radio':radio, - 'countries':countries, - 'cities':cities, - 'districts':districts, - 'neighborhoods':neighborhoods, - 'villages':villages, - 'param':param - })|raw }} + {{ addBlock('ads-list/partials/list-filter',{ + 'mainCats':mainCats, + 'subCats':subCats, + 'ranges':ranges, + 'checkboxes':checkboxes, + 'topfields' : topfields, + 'radio':radio, + 'countries':countries, + 'cities':cities, + 'districts':districts, + 'neighborhoods':neighborhoods, + 'villages':villages, + 'param':param + })|raw }} - - {% include 'visiosoft.module.advs::list/partials/price-filter' %} - + + {% include 'visiosoft.module.advs::list/partials/price-filter' %} + - -
- -
-
-
- - -
-
- - -
-
- - -
-
-
+ +
+ - - - -
- -
-
-
- +
+
+ - -
-
- - -
+ type="radio" name="date" id="dateDay" + value="day"> + +
+
+ + +
+
+ +
- +
+ - -
- -
-
-
- - -
+ +
+ +
+
+
+ + +
+
+ +
- +
+ -
-
-
- -
+ +
+ +
+
+
+ + +
+ + +
+
+
+ +
+
+
- \ No newline at end of file +
+ \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index d0f3880cd..cebb0c162 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -13,7 +13,6 @@ use Visiosoft\LocationModule\Village\VillageRepository; use Visiosoft\LocationModule\Village\VillageModel; use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface; use Visiosoft\CatsModule\Category\CategoryRepository; -use Anomaly\Streams\Platform\Model\Advs\AdvsCategoriesEntryModel; use Visiosoft\CatsModule\Category\CategoryModel; use Illuminate\Routing\Router; use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface; @@ -111,11 +110,11 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'getlocations' => 'Visiosoft\AdvsModule\Http\Controller\advsController@getLocations', 'advs/main' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advsMainPage', 'advs/adv/{id}' => [ - 'as' => 'adv_detail', + 'as' => 'adv_detail_backup', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' ], 'advs/adv/{id}/{seo}' => [ - 'as' => 'adv_detail_seo', + 'as' => 'adv_detail_seo_backup', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@view' ], 'ad/{id}' => [ diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig index 3a0518888..311344e88 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -4,7 +4,7 @@ - + diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js index a012e7a83..543c27474 100644 --- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js +++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js @@ -8,7 +8,7 @@ var village; $('.filter-country-btn').on('click', function () { if (countries == undefined) { var promiseForCountries = new Promise(function (resolve, reject) { - crud('', '/ajax/getCountry', 'POST', beforeSend(), function (callback) { + locationCrud('', '/ajax/getCountry', 'POST', beforeSend(), function (callback) { countries = callback; resetValue('country', true, false) $.each(countries, function (index, value) { @@ -39,7 +39,7 @@ $('.filter-city-btn').on('click', function () { if (cities == undefined || $(this).attr('data-parent') != countries_value) { $(this).attr('data-parent', countries_value) var promiseForCities = new Promise(function (resolve, reject) { - crud('id=' + countries_value, '/ajax/getCities', 'POST', beforeSend(), function (callback) { + locationCrud('id=' + countries_value, '/ajax/getCities', 'POST', beforeSend(), function (callback) { cities = callback; resetValue('city', true, false) $.each(cities, function (index, value) { @@ -73,7 +73,7 @@ $('.filter-district-btn').on('click', function () { if (districts == undefined || $(this).attr('data-parent') != city_value) { $(this).attr('data-parent', city_value) var promiseForDistricts = new Promise(function (resolve, reject) { - crud('id=' + city_value, '/ajax/getDistricts', 'POST', beforeSend(), function (callback) { + locationCrud('id=' + city_value, '/ajax/getDistricts', 'POST', beforeSend(), function (callback) { districts = callback; resetValue('district', true, false) $.each(districts, function (index, value) { @@ -107,7 +107,7 @@ $('.filter-neighborhood-btn').on('click', function () { if (neighborhoods == undefined || $(this).attr('data-parent') != district_value) { $(this).attr('data-parent', district_value) var promiseForNeighborhoods = new Promise(function (resolve, reject) { - crud('id=' + district_value, '/ajax/getNeighborhoods', 'POST', beforeSend(), function (callback) { + locationCrud('id=' + district_value, '/ajax/getNeighborhoods', 'POST', beforeSend(), function (callback) { neighborhoods = callback; resetValue('neighborhood', true, false) $.each(neighborhoods, function (index, value) { @@ -141,7 +141,7 @@ $('.filter-village-btn').on('click', function () { if (village == undefined || $(this).attr('data-parent') != neighborhood_value) { $(this).attr('data-parent', neighborhood_value) var promiseForVillage = new Promise(function (resolve, reject) { - crud('id=' + neighborhood_value, '/ajax/getVillage', 'POST', beforeSend(), function (callback) { + locationCrud('id=' + neighborhood_value, '/ajax/getVillage', 'POST', beforeSend(), function (callback) { village = callback; $('.filter-location-modal .village').html(""); $.each(village, function (index, value) { @@ -225,7 +225,7 @@ function SelectOnClick() { } -function crud(params, url, type, beforeSend, callback) { +function locationCrud(params, url, type, beforeSend, callback) { $.ajax({ type: type, data: params,