From 01381a75430454a7ec0a79afad3eb571f8b0e613 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 20 Apr 2020 18:31:20 +0300 Subject: [PATCH] =?UTF-8?q?#1282=20fuardayim.com=20yap=C4=B1lacak=20alanla?= =?UTF-8?q?r.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/settings/sections.php | 2 ++ .../resources/config/settings/settings.php | 13 +++++++++++++ .../advs-module/resources/js/new-create.js | 5 +++-- .../advs-module/resources/lang/en/setting.php | 7 +++++++ .../src/Http/Controller/advsController.php | 3 +++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index afe2db15d..eb2e98add 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -18,6 +18,8 @@ return [ 'title' => 'visiosoft.module.advs::section.ads', 'fields' => [ 'latest-limit', + 'default_view_type', + 'hide_zero_price', 'auto_approve', 'estimated_pending_time', 'default_published_time', diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index c63c27f0d..4b56fe2db 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -14,6 +14,19 @@ return [ 'default_value' => 5, ], ], + 'default_view_type' => [ + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'options' => ['list' => 'List', 'table' => 'Table', 'map' => 'Map', 'gallery' => 'Gallery'], + 'default_value' => 'list', + ] + ], + 'hide_zero_price' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ], + ], 'auto_approve' => [ 'type' => 'anomaly.field_type.boolean', 'bind' => 'adv.auto_approve', 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 74801a25a..c75f3693a 100644 --- a/addons/default/visiosoft/advs-module/resources/js/new-create.js +++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js @@ -211,8 +211,9 @@ $(document).ready(function () { }); $(".priceField, .priceDecimalField").on('change', function () { - var price = parseInt($(".priceField").val().replace(/\./g, '')); - var decimal = parseInt($(".priceDecimalField").val()); + let price = $(".priceField").val() === "" ? '0' : $(".priceField").val(); + price = parseInt(price.replace(/\./g, '')); + let decimal = parseInt($(".priceDecimalField").val()); $('.priceHidden').find('input').val(parseFloat(price + "." + decimal)); }) }); diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 0ae1ae9a5..3e8095be3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -4,6 +4,13 @@ return [ 'auto_approve' => [ 'name' => 'Auto Approve', ], + 'default_view_type' => [ + 'name' => 'Default View Type', + ], + 'hide_zero_price' => [ + 'name' => 'Hide Price if Zero', + 'instructions' => 'Hide the price if the ad price is 0', + ], 'estimated_pending_time' => [ 'name' => 'Estimated Pending Time', 'instructions' => 'In Hours', 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 f9058fd83..d7f94566e 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -288,6 +288,9 @@ class AdvsController extends PublicController public function viewTypeBasedRedirect($viewType, $compact) { + if (!$viewType) { + $viewType = setting_value('visiosoft.module.advs::default_view_type'); + } if (isset($viewType) and $viewType == 'table') { return $this->view->make('visiosoft.module.advs::list/table', $compact); } elseif (isset($viewType) and $viewType == 'map') {