From 9db731dc6cdef4df4c5ae15afc1b3c6d0467bb1e Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 9 Dec 2020 12:47:15 +0300 Subject: [PATCH 1/3] #2819 minor fix (google & facebook address bonus) --- .../profile-module/resources/lang/en/field.php | 6 ++++++ .../resources/views/profile/detail.twig | 17 ++++++++++++++++- .../src/Profile/Profile/ProfileFormBuilder.php | 4 +++- .../src/Profile/Profile/ProfileFormHandler.php | 2 ++ .../src/Seed/UsersFieldsSeeder.php | 10 ++++++++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php index 12092bfb3..5ac8fe1d6 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php @@ -58,6 +58,12 @@ return [ 'birthday' => [ 'name' => 'Birthday' ], + 'facebook_address' => [ + 'name' => 'Facebook Address' + ], + 'google_address' => [ + 'name' => 'Google Address' + ], 'education' => [ 'name' => 'Education' ], 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 2f649fb22..8b733d248 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -149,7 +149,22 @@ {{ profileForm.fields.birthday.configSet('date_format','Y-m-d').setPlaceholder(now|date('Y-m-d')).input|raw }} - +
+ +
+
+
+ + {{ profileForm.fields.google_address.input|raw }} +
+
{% if setting_value('visiosoft.module.profile::show_education_profession') %}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php index b005cf522..d93408d68 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php @@ -17,7 +17,9 @@ class ProfileFormBuilder extends FormBuilder 'state_of_education', 'profession', 'birthday', - 'register_type' + 'register_type', + 'facebook_address', + 'google_address', ]; protected $actions = [ diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php index 1b98c239f..2a93e5a21 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php @@ -23,6 +23,8 @@ class ProfileFormHandler 'identification_number' => $builder->getPostValue('identification_number'), 'birthday' => $builder->getPostValue('birthday'), 'register_type' => $builder->getPostValue('register_type'), + 'facebook_address' => $builder->getPostValue('facebook_address'), + 'google_address' => $builder->getPostValue('google_address'), ]; if (setting_value('visiosoft.module.profile::show_education_profession')) { diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index a377a6535..cf4271066 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php @@ -139,6 +139,16 @@ class UsersFieldsSeeder extends Seeder 'slug' => 'profession', 'type' => 'anomaly.field_type.text', ], + [ + 'name' => trans('visiosoft.module.profile::field.facebook_address.name'), + 'slug' => 'facebook_address', + 'type' => 'anomaly.field_type.text', + ], + [ + 'name' => trans('visiosoft.module.profile::field.google_address.name'), + 'slug' => 'google_address', + 'type' => 'anomaly.field_type.text', + ] ]; foreach ($customFields as $customField) { From a8e45acb042b7b0de0bc664acf6db680c6b8e224 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 9 Dec 2020 15:05:48 +0300 Subject: [PATCH 2/3] #2692 ads image upload extension fixed --- .../resources/views/upload/partials/body.twig | 27 ++- database/seeds/DatabaseSeeder.php | 226 +++++++++--------- 2 files changed, 133 insertions(+), 120 deletions(-) diff --git a/addons/default/visiosoft/media-field_type/resources/views/upload/partials/body.twig b/addons/default/visiosoft/media-field_type/resources/views/upload/partials/body.twig index afa8736a4..223babf0f 100644 --- a/addons/default/visiosoft/media-field_type/resources/views/upload/partials/body.twig +++ b/addons/default/visiosoft/media-field_type/resources/views/upload/partials/body.twig @@ -1,15 +1,20 @@ +{% set folders = entries('files','folders').whereIn('slug',field_type.configGet('folders')).get() %} +{% set allowed_types = {} %} +{% for mimes in folders.pluck('allowed_types.value').all() %} + {% set allowed_types = allowed_types|merge(mimes) %} +{% endfor %}
-
+
-
+
\ No newline at end of file diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index b8ae3bc0a..b90ff0f09 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -18,135 +18,143 @@ use Illuminate\Support\Facades\DB; class DatabaseSeeder extends Seeder { - protected $widgets; - protected $menus; - protected $users; - protected $roles; - protected $activator; - protected $disks; - protected $folders; + protected $widgets; + protected $menus; + protected $users; + protected $roles; + protected $activator; + protected $disks; + protected $folders; - public function __construct( - WidgetRepositoryInterface $widgets, - MenuRepositoryInterface $menus, - UserRepositoryInterface $users, - DiskRepositoryInterface $disks, - FolderRepositoryInterface $folders, - RoleRepositoryInterface $roles, - UserActivator $activator - ) - { - $this->widgets = $widgets; - $this->menus = $menus; - $this->users = $users; - $this->roles = $roles; - $this->activator = $activator; - $this->disks = $disks; - $this->folders = $folders; - } + public function __construct( + WidgetRepositoryInterface $widgets, + MenuRepositoryInterface $menus, + UserRepositoryInterface $users, + DiskRepositoryInterface $disks, + FolderRepositoryInterface $folders, + RoleRepositoryInterface $roles, + UserActivator $activator + ) + { + $this->widgets = $widgets; + $this->menus = $menus; + $this->users = $users; + $this->roles = $roles; + $this->activator = $activator; + $this->disks = $disks; + $this->folders = $folders; + } - public function run() - { + public function run() + { - $admin = $this->roles->findBySlug('admin'); + $admin = $this->roles->findBySlug('admin'); - $this->users->unguard(); - $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete(); - $visiosoft_administrator = $this->users->create( - [ - 'display_name' => 'openclassify', - 'email' => "info@openclassify.com", - 'username' => "openclassify", - 'password' => "openclassify", - ] - ); + $this->users->unguard(); + $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete(); + $visiosoft_administrator = $this->users->create( + [ + 'display_name' => 'openclassify', + 'email' => "info@openclassify.com", + 'username' => "openclassify", + 'password' => "openclassify", + ] + ); - $visiosoft_administrator->roles()->sync([$admin->getId()]); + $visiosoft_administrator->roles()->sync([$admin->getId()]); - $this->activator->force($visiosoft_administrator); + $this->activator->force($visiosoft_administrator); - //Footer Link - LinkModel::query()->forceDelete(); - $repository = new EntryRepository(); - $repository->setModel(new UrlLinkTypeModel()); - $menu = $this->menus->findBySlug('footer'); + //Footer Link + LinkModel::query()->forceDelete(); + $repository = new EntryRepository(); + $repository->setModel(new UrlLinkTypeModel()); + $menu = $this->menus->findBySlug('footer'); - $openclassify = $repository->create( - [ - 'en' => [ - 'title' => 'OpenClassify.com', - ], - 'url' => 'https://openclassify.com/', - ] - ); - $visiosoft = $repository->create( - [ - 'en' => [ - 'title' => 'Visiosoft Inc.', - ], - 'url' => 'https://visiosoft.com.tr/', - ] - ); + $openclassify = $repository->create( + [ + 'en' => [ + 'title' => 'OpenClassify.com', + ], + 'url' => 'https://openclassify.com/', + ] + ); + $visiosoft = $repository->create( + [ + 'en' => [ + 'title' => 'Visiosoft Inc.', + ], + 'url' => 'https://visiosoft.com.tr/', + ] + ); - LinkModel::query()->create( - [ - 'menu' => $menu, - 'target' => '_blank', - 'entry' => $openclassify, - 'type' => 'anomaly.extension.url_link_type', - ] - ); - LinkModel::query()->create( - [ - 'menu' => $menu, - 'target' => '_blank', - 'entry' => $visiosoft, - 'type' => 'anomaly.extension.url_link_type', - ] - ); + LinkModel::query()->create( + [ + 'menu' => $menu, + 'target' => '_blank', + 'entry' => $openclassify, + 'type' => 'anomaly.extension.url_link_type', + ] + ); + LinkModel::query()->create( + [ + 'menu' => $menu, + 'target' => '_blank', + 'entry' => $visiosoft, + 'type' => 'anomaly.extension.url_link_type', + ] + ); - DB::table('files_files')->truncate(); + 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')); - file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r')); - file_put_contents(storage_path('images.zip'), fopen($repository . "images.zip", "r")); - file_put_contents(storage_path('cats.zip'), fopen($repository . "cats.zip", "r")); + $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')); + file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r')); + file_put_contents(storage_path('images.zip'), fopen($repository . "images.zip", "r")); + file_put_contents(storage_path('cats.zip'), fopen($repository . "cats.zip", "r")); - Model::unguard(); - DB::unprepared(file_get_contents(storage_path('advs.sql'))); - DB::unprepared(file_get_contents(storage_path('categories.sql'))); - DB::unprepared(file_get_contents(storage_path('settings.sql'))); - Model::reguard(); + Model::unguard(); + DB::unprepared(file_get_contents(storage_path('advs.sql'))); + DB::unprepared(file_get_contents(storage_path('categories.sql'))); + DB::unprepared(file_get_contents(storage_path('settings.sql'))); + Model::reguard(); - $zip = new ZipArchive(); - $zip->open(storage_path('images.zip'), ZipArchive::CREATE); - $zip->extractTo(storage_path('streams/default/files-module/local/images/')); - $zip->open(storage_path('cats.zip'), ZipArchive::CREATE); - $zip->extractTo(storage_path('streams/default/files-module/local/images/')); - $zip->close(); + $zip = new ZipArchive(); + $zip->open(storage_path('images.zip'), ZipArchive::CREATE); + $zip->extractTo(storage_path('streams/default/files-module/local/images/')); + $zip->open(storage_path('cats.zip'), ZipArchive::CREATE); + $zip->extractTo(storage_path('streams/default/files-module/local/images/')); + $zip->close(); - $this->call(widgetSeeder::class); + $this->call(widgetSeeder::class); - //Create Store Icon Folder - if (!$this->folders->findBySlug('ads_excel')) { - $disk = $this->disks->findBySlug('local'); + //Create Store Icon Folder + if (!$this->folders->findBySlug('ads_excel')) { + $disk = $this->disks->findBySlug('local'); - $this->folders->create([ - 'en' => [ - 'name' => 'Ads Excel', - 'description' => 'A folder for Ads Excel.', - ], - 'slug' => 'ads_excel', - 'disk' => $disk - ]); - }; - } + $this->folders->create([ + 'en' => [ + 'name' => 'Ads Excel', + 'description' => 'A folder for Ads Excel.', + ], + 'slug' => 'ads_excel', + 'disk' => $disk + ]); + }; + + if ($images_folder = $this->folders->findBySlug('images')) { + $images_folder->update([ + 'allowed_types' => [ + 'jpg', 'jpeg','png' + ], + ]); + } + } } From e1439a89644f0ce453f05ee1498f2fb465988ee8 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 9 Dec 2020 16:26:14 +0300 Subject: [PATCH 3/3] #2692 price area hidden settings --- .../advs-module/resources/config/settings/sections.php | 1 + .../advs-module/resources/config/settings/settings.php | 6 ++++++ .../visiosoft/advs-module/resources/lang/en/setting.php | 4 +++- .../advs-module/resources/views/new-ad/new-create.twig | 4 +++- 4 files changed, 13 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 300e9539e..92d4a8d3c 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -23,6 +23,7 @@ return [ 'latest-limit', 'popular_ads_limit', 'default_view_type', + 'price_area_hidden', 'hide_listing_standard_price', 'hide_zero_price', 'auto_approve', 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 0eb3541bc..d3c42dd98 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -153,6 +153,12 @@ return [ 'mode' => 'checkbox' ] ], + 'price_area_hidden' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], 'enabled_currencies' => [ 'bind' => 'streams::currencies.enabled', 'env' => 'ADV_ENABLED_CURRENCIES', 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 b213d2b67..c773d2cce 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -126,7 +126,9 @@ return [ 'market_place' => [ 'name' => 'Market Place', ], - + 'price_area_hidden' => [ + 'name' => 'Price Area Hidden', + ], 'hide_price_filter' => [ 'name' => 'Hide Price Filter', ], diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 5cf2e8341..af3e2b57c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -90,7 +90,9 @@
-
+
+