From af2d07b00220963866623f96a8d42673ab419fb4 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Mar 2021 11:16:27 +0300 Subject: [PATCH 1/6] fixed location filter --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index f011616a0..779e01c47 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -67,7 +67,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface }); } } - if (!setting_value('visiosoft.module.location::hide_location_filter') and isset($param['country'])) { + if (!setting_value('visiosoft.module.location::hide_location_filter')) { $country = !empty($param['country']) ? $param['country'] : setting_value('visiosoft.module.location::default_country'); if ($country) { $query = $query->where('country_id', $country); From 123e5e0bd87e1a5119b3f9333ddc03728c29cf68 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Mar 2021 14:40:22 +0300 Subject: [PATCH 2/6] filter add display_name --- .../src/Http/Controller/Admin/UsersController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/UsersController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/UsersController.php index 090c58b74..99906459c 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/UsersController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/UsersController.php @@ -18,9 +18,10 @@ class UsersController extends AdminController $term = request()->term; if ($term) { return $userRepository->newQuery() - ->select(DB::raw("CONCAT_WS('', first_name, ' ', last_name, ' (', gsm_phone, ' || ', email, ')') AS name"), 'id') + ->select(DB::raw("CONCAT_WS('', first_name, ' ', last_name, ' (', gsm_phone, ' || ', display_name, ' || ', email, ')') AS name"), 'id') ->where('first_name', 'LIKE', "%$term%") ->orWhere('last_name', 'LIKE', "%$term%") + ->orWhere('display_name', 'LIKE', "%$term%") ->orWhere('gsm_phone', 'LIKE', "%$term%") ->limit(setting_value('visiosoft.module.advs::user_filter_limit')) ->pluck('name', 'id'); From 9633ab2600d5c55cb0c2fdc22b380aa9695856bf Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Mar 2021 16:34:27 +0300 Subject: [PATCH 3/6] fixed view ad for admin --- .../advs-module/src/Http/Controller/advsController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 fc02329eb..58c2b0209 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -482,10 +482,9 @@ class AdvsController extends PublicController $id = $seo; $adv = $this->adv_repository->getListItemAdv($id); } - - if ($adv && ((!$adv->expired() && $adv->getStatus() === 'approved') || $adv->created_by_id === \auth()->id())) { + if (auth()->user()->hasRole('admin') or ($adv && ((!$adv->expired() && $adv->getStatus() === 'approved') || $adv->created_by_id === \auth()->id()))) { // Check if created by exists - if (!$adv->created_by) { + if (!auth()->user()->hasRole('admin') and !$adv->created_by) { $this->messages->error('visiosoft.module.advs::message.this_ad_is_not_valid_anymore'); return $this->redirect->route('visiosoft.module.advs::list'); } From a08e5f3255f30c83211b51a8fdec7e1a0b785ac0 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 2 Mar 2021 11:58:54 +0300 Subject: [PATCH 4/6] fixed error --- .../advs-module/src/Http/Controller/advsController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 58c2b0209..6a33ec44b 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -482,9 +482,10 @@ class AdvsController extends PublicController $id = $seo; $adv = $this->adv_repository->getListItemAdv($id); } - if (auth()->user()->hasRole('admin') or ($adv && ((!$adv->expired() && $adv->getStatus() === 'approved') || $adv->created_by_id === \auth()->id()))) { + + if ((auth()->user() and auth()->user()->hasRole('admin')) or ($adv && ((!$adv->expired() && $adv->getStatus() === 'approved') || $adv->created_by_id === \auth()->id()))) { // Check if created by exists - if (!auth()->user()->hasRole('admin') and !$adv->created_by) { + if ((auth()->user() and !auth()->user()->hasRole('admin')) and !$adv->created_by) { $this->messages->error('visiosoft.module.advs::message.this_ad_is_not_valid_anymore'); return $this->redirect->route('visiosoft.module.advs::list'); } From 72179e6fb6806d9279533053eee6cf035cb44277 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 2 Mar 2021 12:21:32 +0300 Subject: [PATCH 5/6] added default site name and description --- database/seeds/settings.sql | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/database/seeds/settings.sql b/database/seeds/settings.sql index 68830c03d..5e0835ad1 100644 --- a/database/seeds/settings.sql +++ b/database/seeds/settings.sql @@ -9,12 +9,14 @@ SET time_zone = "+00:00"; /*!40101 SET NAMES utf8mb4 */; -INSERT INTO `default_settings_settings` (`id`, `sort_order`, `created_at`, `created_by_id`, `updated_at`, `updated_by_id`, `key`, `value`) VALUES -(7, 7, '2019-07-15 06:48:46', 1, '2019-07-15 06:53:05', 1, 'streams::date_format', 'j F, Y'), -(8, 8, '2019-07-15 06:48:46', 1, '2019-07-15 06:53:05', 1, 'streams::time_format', 'H:i'), -(11, 11, '2019-07-15 06:48:46', 1, '2019-07-15 06:53:05', 1, 'streams::standard_theme', 'visiosoft.theme.base'), -(12, 12, '2019-07-15 06:48:46', 1, '2019-07-15 06:53:05', 1, 'streams::admin_theme', 'visiosoft.theme.defaultadmin'), -(15, 15, '2019-07-15 06:48:46', 1, '2019-07-15 06:53:05', 1, 'streams::enabled_locales', 'a:11:{i:0;s:2:\"en\";i:1;s:2:\"fa\";i:2;s:2:\"ar\";i:3;s:2:\"el\";i:4;s:2:\"es\";i:5;s:2:\"fr\";i:6;s:2:\"it\";i:7;s:2:\"nl\";i:8;s:2:\"pt\";i:9;s:2:\"ru\";i:10;s:2:\"tr\";}'); +INSERT INTO `default_settings_settings` (`created_at`,`key`, `value`) VALUES +('2019-07-15 06:48:46', 'streams::date_format', 'j F, Y'), +('2019-07-15 06:48:46', 'streams::time_format', 'H:i'), +('2019-07-15 06:48:46', 'streams::name', 'PHP Classifieds software'), +('2019-07-15 06:48:46', 'streams::description', 'OpenClassify is modular and most advanced open source classified platform build with Laravel.Use it in real estate classifieds, auto, e-commerce and other ...'), +('2019-07-15 06:48:46', 'streams::standard_theme', 'visiosoft.theme.base'), +('2019-07-15 06:48:46', 'streams::admin_theme', 'visiosoft.theme.defaultadmin'), +('2019-07-15 06:48:46', 'streams::enabled_locales', 'a:11:{i:0;s:2:\"en\";i:1;s:2:\"fa\";i:2;s:2:\"ar\";i:3;s:2:\"el\";i:4;s:2:\"es\";i:5;s:2:\"fr\";i:6;s:2:\"it\";i:7;s:2:\"nl\";i:8;s:2:\"pt\";i:9;s:2:\"ru\";i:10;s:2:\"tr\";}'); COMMIT; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; From 8db5fd98d272b8470ef11221855f815ae063e5ea Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 2 Mar 2021 13:14:58 +0300 Subject: [PATCH 6/6] fixed sentry errors --- .../profile-module/src/ProfileModuleServiceProvider.php | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 2d8df1b3e..476ce364a 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -68,6 +68,7 @@ class ProfileModuleServiceProvider extends AddonServiceProvider 'profile/class/extendTime/{id},{type}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@extendAds', 'profile/message/show/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@showMessage', 'profile/close-account' => [ + 'middleware' => 'auth', 'as' => 'visiosoft.module.profile::profile_close_account', 'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@disableAccount' ],