From 694163230c1e7c8aec356a99f430d7154a193432 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 26 Oct 2020 12:00:51 +0300 Subject: [PATCH 1/5] #2440 [emadencilik] campaign definition --- .../Category/Contract/CategoryInterface.php | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php index d3c20ba24..0e6e89b7b 100644 --- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php +++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php @@ -4,5 +4,31 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface CategoryInterface extends EntryInterface { + public function getCat($id); + + public function getParentCats($id, $type = null); + + public function getCatLevel($id); + + public function getParentsCount($id); + + public function getSubCategories($id, $get = null); + + public function getAllSubCategories($id); + + public function deleteSubCategories($id); + + public function searchKeyword($keyword, $selected = null); + + public function getMainCategory(); + + public function getMeta_keywords($cat_id); + + public function getMeta_description($cat_id); + + public function getMeta_title($cat_id); + + public function getMains($id); + public function getParent(); } From d2405790085b96a5218491ca0a0b0cac3094ca79 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 26 Oct 2020 15:04:23 +0300 Subject: [PATCH 2/5] #2463 oc gallery photos improvments --- addons/default/visiosoft/advs-module/resources/css/list.css | 4 ++++ .../visiosoft/advs-module/resources/views/list/gallery.twig | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index 6cb92603a..859132a2c 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -146,4 +146,8 @@ a.sort-by-open-dropdown:hover { .sort-by-item:hover { text-decoration: underline; cursor: pointer; +} + +.gallery-tn { + object-fit: cover; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index eb087cf5a..d2140a2c8 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -7,7 +7,7 @@
-
From 066a27e9a550c81097615e214d92b3c0c5c93a79 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 26 Oct 2020 16:30:41 +0300 Subject: [PATCH 3/5] #2386 admin advs list - user select2 make it ajax --- .../advs-module/resources/js/list.js | 20 ++++++++++++++++++- .../Http/Controller/Admin/UsersController.php | 16 +++++++++++++++ .../src/ProfileModuleServiceProvider.php | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index ecf5f4b07..2311ecba7 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -151,7 +151,25 @@ $(document).ready(function () { // User filter $("select[name=filter_User]").select2({ - placeholder: $('select[name=filter_User] option:first-child').text() + placeholder: $('select[name=filter_User] option:first-child').text(), + ajax: { + url: '/api/profile/query-users', + dataType: 'json', + processResults: function (data) { + let formattedData = []; + + Object.keys(data).forEach(function (id) { + formattedData.push({ + 'id': id, + 'text': data[id] + }) + }) + + return { + results: formattedData + } + } + } }); // Country filter 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 d7d403317..bcc15325f 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 @@ -1,6 +1,8 @@ term; + if ($term) { + return $userRepository->newQuery() + ->select(DB::raw("CONCAT_WS('', first_name, ' ', last_name, ' (', gsm_phone, ' || ', email, ')') AS name"), 'id') + ->where('first_name', 'LIKE', "%$term%") + ->orWhere('last_name', 'LIKE', "%$term%") + ->orWhere('gsm_phone', 'LIKE', "%$term%") + ->limit(5) + ->pluck('name', 'id'); + } + } } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 2c45177fe..bbedeac27 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -69,6 +69,7 @@ class ProfileModuleServiceProvider extends AddonServiceProvider 'as' => 'users::exportUsers', 'uses' => 'Visiosoft\ProfileModule\Http\Controller\Admin\UsersController@exportUsers' ], + 'api/profile/query-users' => 'Visiosoft\ProfileModule\Http\Controller\Admin\UsersController@queryUsers', // MyProfileController 'profile/ads' => [ From 9701bd1937029d82d7a97067fa3f04b6a0439fed Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 26 Oct 2020 16:36:31 +0300 Subject: [PATCH 4/5] setting limit --- .../advs-module/resources/config/settings/sections.php | 2 +- .../advs-module/resources/config/settings/settings.php | 6 ++++++ .../visiosoft/advs-module/resources/lang/en/setting.php | 4 ++++ .../src/Http/Controller/Admin/UsersController.php | 2 +- 4 files changed, 12 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 7d94fd80c..b745f7bf3 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -60,7 +60,7 @@ return [ 'filter' => [ 'title' => 'visiosoft.module.advs::section.filter', 'fields' => [ - 'hide_price_filter', 'hide_date_filter', 'hide_photo_filter', 'hide_map_filter' + 'hide_price_filter', 'hide_date_filter', 'hide_photo_filter', 'hide_map_filter', 'user_filter_limit' ], ], ], 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 fe39dc59c..de242f57c 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -283,4 +283,10 @@ return [ 'default_value' => 'top-right', ] ], + 'user_filter_limit' => [ + 'type' => 'anomaly.field_type.integer', + 'config' => [ + 'default_value' => 5, + ], + ], ]; 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 07d95f740..2e748fcf5 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -176,4 +176,8 @@ return [ 'watermark_position' => [ 'name' => 'Watermark Position', ], + 'user_filter_limit' => [ + 'name' => 'User Filter Limit', + 'instructions' => 'In the admin panel' + ] ]; 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 bcc15325f..090c58b74 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 @@ -22,7 +22,7 @@ class UsersController extends AdminController ->where('first_name', 'LIKE', "%$term%") ->orWhere('last_name', 'LIKE', "%$term%") ->orWhere('gsm_phone', 'LIKE', "%$term%") - ->limit(5) + ->limit(setting_value('visiosoft.module.advs::user_filter_limit')) ->pluck('name', 'id'); } } From 35b0e80fee568c09eb6ddc6d7c75bb2d25d7e442 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 26 Oct 2020 17:13:52 +0300 Subject: [PATCH 5/5] #2386 admin advs list - user select2 make it ajax --- .../default/visiosoft/advs-module/resources/css/custom.css | 4 ++++ .../advs-module/src/Http/Controller/Admin/AdvsController.php | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/custom.css b/addons/default/visiosoft/advs-module/resources/css/custom.css index 8b202042d..54242c139 100644 --- a/addons/default/visiosoft/advs-module/resources/css/custom.css +++ b/addons/default/visiosoft/advs-module/resources/css/custom.css @@ -40,4 +40,8 @@ .select2-container--default .select2-selection--single .select2-selection__arrow { top: unset; +} + +select[name=filter_User] + .select2 { + min-width: 20rem; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 2321df840..6a00e9400 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -167,10 +167,6 @@ class AdvsController extends AdminController $cities = $cityModel->all()->pluck('name', 'id')->all(); - $users = $userModel->newQuery() - ->select(DB::raw("CONCAT_WS('', first_name, ' ', last_name, ' (', gsm_phone, ' || ', email, ')') AS display_name"), 'id') - ->pluck('display_name', 'id') - ->toArray(); $categories = $categoryModel::query()->where('parent_category_id', null) ->leftJoin('cats_category_translations', 'cats_category.id', '=', 'cats_category_translations.entry_id') ->where('locale', config('app.locale')) @@ -194,7 +190,6 @@ class AdvsController extends AdminController 'exact' => true, 'filter' => 'select', 'query' => UserFilterQuery::class, - 'options' => $users, ], 'status' => [ 'filter' => 'select',