From 9265b47a6ec468d06582ec4c7c7d372ba2df4b4d Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 5 Jan 2021 11:17:31 +0300 Subject: [PATCH 1/4] GET feature enhancements --- .../advs-module/resources/config/settings/sections.php | 1 + .../advs-module/resources/config/settings/settings.php | 8 ++++++++ .../visiosoft/advs-module/resources/lang/en/setting.php | 4 ++++ .../visiosoft/advs-module/resources/lang/tr/setting.php | 4 ++++ .../advs-module/src/Http/Controller/advsController.php | 3 ++- 5 files changed, 19 insertions(+), 1 deletion(-) 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 2ee3b9126..b54f66702 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -31,6 +31,7 @@ return [ 'estimated_pending_time', 'default_published_time', 'default_GET', + 'get_categories', 'listing_page_image', 'show_ads_count', ], 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 dad9311c7..e5bca4a16 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -373,4 +373,12 @@ return [ 'bind' => 'advs.lang_switcher_for_browser', 'env' => 'LANG_SWITCHER_FOR_BROWSER', ], + 'get_categories' => [ + 'type' => 'anomaly.field_type.checkboxes', + 'config' => [ + 'options' => function (\Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface $categoryRepository) { + return $categoryRepository->mainCats()->pluck('name', 'id')->all(); + }, + ], + ], ]; 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 8db143069..28be23772 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -223,4 +223,8 @@ return [ 'name' => 'Lang Switcher For Browser', 'instructions' => 'Allows you to choose browser language as active language' ], + 'get_categories' => [ + 'name' => 'GET Categories', + 'instructions' => 'It represents the categories in which the GET property will be valid.' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 53d647cdd..c4201db02 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -223,4 +223,8 @@ return [ 'name' => 'Tarayıcı Diline Geç', 'instructions' => 'Seçili aktif bir dil olmadığında tarayıcı dilini aktif dil olarak seçmenize izin verir' ], + 'get_categories' => [ + 'name' => 'GET Kategorileri', + 'instructions' => 'GET özelliğinin geçerli olacağı kategorileri temsil eder.' + ], ]; 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 89fad88d1..71cf0e237 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -781,7 +781,8 @@ class AdvsController extends PublicController } } - $adv->is_get_adv = $request->is_get_adv; + $get_categories = in_array($adv->cat1, setting_value('visiosoft.module.advs::get_categories')); + $adv->is_get_adv = ($request->is_get_adv and $get_categories) ? true : false; $adv->save(); //algolia Search Module From 92b54219186d5796c38b9680f2b1d3e267ba6806 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 5 Jan 2021 13:48:14 +0300 Subject: [PATCH 2/4] ax --- .../profile-module/resources/images/location.svg | 11 +++++++++-- .../resources/images/social-media.svg | 14 ++++++++++++-- .../profile-module/resources/images/website.svg | 16 ++++++++++++++-- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/images/location.svg b/addons/default/visiosoft/profile-module/resources/images/location.svg index 74fcde598..0b5a83c2a 100644 --- a/addons/default/visiosoft/profile-module/resources/images/location.svg +++ b/addons/default/visiosoft/profile-module/resources/images/location.svg @@ -1,2 +1,9 @@ - - + + + + + + + + + diff --git a/addons/default/visiosoft/profile-module/resources/images/social-media.svg b/addons/default/visiosoft/profile-module/resources/images/social-media.svg index e948e1bfc..90ea51fba 100644 --- a/addons/default/visiosoft/profile-module/resources/images/social-media.svg +++ b/addons/default/visiosoft/profile-module/resources/images/social-media.svg @@ -1,2 +1,12 @@ - - + + + + + + + + + + + + diff --git a/addons/default/visiosoft/profile-module/resources/images/website.svg b/addons/default/visiosoft/profile-module/resources/images/website.svg index babe27185..2a7d601fe 100644 --- a/addons/default/visiosoft/profile-module/resources/images/website.svg +++ b/addons/default/visiosoft/profile-module/resources/images/website.svg @@ -1,2 +1,14 @@ - - + + + + + + + + + + + + + + From d8d2869339f205e34eb8e83c8dbbf435bc3ccee4 Mon Sep 17 00:00:00 2001 From: samed Date: Thu, 7 Jan 2021 11:53:13 +0300 Subject: [PATCH 3/4] account freez --- .../profile-module/resources/views/profile/detail.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig index 9694864cf..9d20e64b4 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -92,7 +92,7 @@

{{ trans('visiosoft.module.profile::message.disable_account') }}

- + From 932d40fb162bea50597d63915a1ba79dc218066f Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Thu, 7 Jan 2021 18:30:59 +0300 Subject: [PATCH 4/4] Update DatabaseSeeder.php --- database/seeds/DatabaseSeeder.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 680ca7d31..b1aff1662 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -109,8 +109,6 @@ class DatabaseSeeder extends Seeder ] ); - DB::table('files_files')->truncate(); - $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r')); file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r'));