diff --git a/addons/default/visiosoft/advs-module/resources/js/cats.js b/addons/default/visiosoft/advs-module/resources/js/cats.js index 19552e8c0..41d28a71d 100644 --- a/addons/default/visiosoft/advs-module/resources/js/cats.js +++ b/addons/default/visiosoft/advs-module/resources/js/cats.js @@ -13,7 +13,7 @@ $(document).ready(function () { $(this).val(all[all.length-1]) }) - const filter = {}; + var filter = {}; filter.getCats = (catId, divId) => { $.ajax({ type: 'get', diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index c0d926667..7df92d54b 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -1,4 +1,4 @@ -const filter = {}; +var filter = {}; filter.checkUser = () => { $.ajax({ diff --git a/addons/default/visiosoft/advs-module/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js index fb3a28e88..76c0d7741 100644 --- a/addons/default/visiosoft/advs-module/resources/js/new-create.js +++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js @@ -7,7 +7,7 @@ function hideLoader() { } -const filter = {}; +var filter = {}; // TODO will be unified 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 bd079cce5..4d22cad4e 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 @@ -97,14 +97,22 @@ style="max-height: 300px;">
-
-
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index c04b38d2c..d3a8e2749 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -168,7 +168,8 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function popularAdvs() { - return $this->getAdv()->orderBy('count_show_ad', 'desc')->limit(10)->get(); + return $this->getAdv()->where('status', 'approved') + ->orderBy('count_show_ad', 'desc')->limit(10)->get(); } public function advsofDay() diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php index 64ba11f6d..9001e58f3 100644 --- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php +++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php @@ -47,7 +47,11 @@ class CategoryController extends AdminController $this->messages->error('Selected category has no sub-categories.'); return back(); } - $table->setTableEntries($categories); + if($request->view != "trash") + { + $table->setTableEntries($categories); + } + return $table->render(); } diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig index f674df48a..5f6910264 100644 --- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig +++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig @@ -82,7 +82,7 @@