From 767dbc155a7043d19a2fc1e68d09bfbd2057b36f Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 3 Feb 2020 12:29:22 +0300 Subject: [PATCH 1/2] add settings section --- .../resources/config/settings/sections.php | 34 +++++++++++++ .../config/{ => settings}/settings.php | 48 ------------------- .../advs-module/resources/lang/en/section.php | 5 +- .../advs-module/resources/lang/tr/section.php | 5 +- 4 files changed, 42 insertions(+), 50 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/resources/config/settings/sections.php rename addons/default/visiosoft/advs-module/resources/config/{ => settings}/settings.php (79%) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php new file mode 100644 index 000000000..390e75b9d --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -0,0 +1,34 @@ + [ + 'stacked' => true, + 'tabs' => [ + + + 'general' => [ + 'title' => 'visiosoft.module.advs::section.general', + 'fields' => [ + 'favicon', 'iban_numbers', 'google_statistic_code', 'ogImage', 'free_currencyconverterapi_key', + 'enabled_currencies' + + ], + ], + + 'ads' => [ + 'title' => 'visiosoft.module.advs::section.ads', + 'fields' => [ + 'latest-limit', 'auto_approve', 'default_published_time', 'default_adv_limit', 'default_GET', + 'watermark_type', 'watermark_text', 'watermark_image', 'watermark_position', 'watermark_opacity', + 'listing_page_image', + ], + ], + 'user' => [ + 'title' => 'visiosoft.module.advs::section.user', + 'fields' => [ + 'register_email_field', + ], + ], + ], + ], +]; diff --git a/addons/default/visiosoft/advs-module/resources/config/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php similarity index 79% rename from addons/default/visiosoft/advs-module/resources/config/settings.php rename to addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 42cb17ab9..40ac2c46c 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -50,22 +50,6 @@ return [ 'default_value' => 15, ], ], - 'address' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.address', - 'env' => 'ADV_ADDRESS', - 'config' => [ - 'default_value' => 'Basaksehir Istanbul', - ], - ], - 'phone' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.phone', - 'env' => 'ADV_PHONE', - 'config' => [ - 'default_value' => '212 555 55 55', - ], - ], 'iban_numbers' => [ 'type' => 'anomaly.field_type.wysiwyg', @@ -118,38 +102,6 @@ return [ 'default_value' => 0, ], ], - 'twitter' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.twitter', - 'env' => 'ADV_TWITTER', - 'config' => [ - 'default_value' => '/twitter.com/visiosoft' - ] - ], - 'facebook' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.facebook', - 'env' => 'ADV_FACEBOOK', - 'config' => [ - 'default_value' => '/facebook.com/visiosoft' - ] - ], - 'youtube' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.youtube', - 'env' => 'ADV_YOUTUBE', - 'config' => [ - 'default_value' => '/youtube.com/visiosoft' - ] - ], - 'google' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.google', - 'env' => 'ADV_GOOGLE', - 'config' => [ - 'default_value' => '/plus.google.com/visiosoft' - ] - ], 'watermark_type' => [ 'type' => 'anomaly.field_type.select', 'bind' => 'adv.watermark_type', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php index 2034fdc7b..1a3eeb889 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php @@ -36,5 +36,8 @@ return [ ], 'assets_clear' => [ 'name' => 'Assets Clear' - ] + ], + 'general' => 'General', + 'ads' => 'Ads', + 'user' => 'User', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/section.php b/addons/default/visiosoft/advs-module/resources/lang/tr/section.php index 0469e2285..259db956a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/section.php @@ -36,5 +36,8 @@ return [ ], 'assets_clear' => [ 'name' => 'Önbellek sil' - ] + ], + 'general' => 'Genel', + 'ads' => 'İlan', + 'user' => 'Kullanıcı', ]; From 5b8480eb808b8c640e7bf11a3e5f114e5ed165b2 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 3 Feb 2020 13:08:03 +0300 Subject: [PATCH 2/2] #258 [admin] Filtering ads with Ad ID --- .../advs-module/src/Adv/Table/AdvTableBuilder.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php index 9c9223912..752bc9707 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php @@ -31,13 +31,17 @@ class AdvTableBuilder extends TableBuilder * @var array|string */ protected $filters = [ - 'search' => [ - 'fields' => [ + 'search' => [ + 'fields' => [ 'name', - 'advs_desc' - ] - ], + 'advs_desc', + ] + ], 'country', + 'id' => [ + 'heading' => 'ID', + 'filter' => 'input' + ], ]; /**