From 6e997e71fa29d4fdd075302211218d293457e66a Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 3 Feb 2020 13:29:08 +0300 Subject: [PATCH 1/4] #243 Searching with ad ID in Ad search bar --- .../advs-module/src/Adv/AdvRepository.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 6856a282d..0050617a8 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -63,13 +63,17 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface }); if (!empty($param['keyword'])) { - $delimiter = '_'; - $keyword = str_slug($param['keyword'], $delimiter); - $query = $query->where(function ($query) use ($keyword) { - $query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%') - ->orWhere('slug', 'like', '%' . $keyword . '%') - ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%'); - }); + if (is_numeric($param['keyword'])) { + $query = $query->where('advs_advs.id', $param['keyword']); + } else { + $delimiter = '_'; + $keyword = str_slug($param['keyword'], $delimiter); + $query = $query->where(function ($query) use ($keyword) { + $query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%') + ->orWhere('slug', 'like', '%' . $keyword . '%') + ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%'); + }); + } } if (!empty($param['country'])) { $query = $query->where('country_id', $param['country']); From f96998d4eda87d1482eb9d1f36be17b66afafe7a Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 3 Feb 2020 15:51:25 +0300 Subject: [PATCH 2/4] version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5cf2e15cc..a743a7240 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "anomaly/tags-field_type": "~2.3.0", "anomaly/slug-field_type": "~2.1.0", "anomaly/text-field_type": "~2.2.0", - "anomaly/file-field_type": "~2.2.32", + "anomaly/file-field_type": "2.2.32", "anomaly/url-field_type": "~2.2.0", "anomaly/configuration-module": "~2.1.0", "anomaly/preferences-module": "~2.1.0", From 521be22a75c5a6533aa0a06f738ba1bd5d419ebe Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 3 Feb 2020 16:03:24 +0300 Subject: [PATCH 3/4] #797 watermark position --- .../src/Http/Controller/UploadController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index b2cd5d67a..bab98b997 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -65,8 +65,11 @@ class UploadController extends AdminController $img = WaterMark::make($this->request->file('upload')->getRealPath()); $watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image'); $watermarkimage = $files->find($watermarkimage_id); + $w = $img->width(); if ($watermarkimage != null) { - $watermark = WaterMark::make(public_path() . '/app/default/files-module/local/' . $watermarkimage->path())->opacity(50); + $watermark = WaterMark::make(public_path() . '/app/default/files-module/local/' . $watermarkimage->path()) + ->opacity($settings->value('visiosoft.module.advs::watermark_opacity')) + ->resize($w); $img->insert($watermark, $position); } @@ -77,7 +80,7 @@ class UploadController extends AdminController $h = "center"; $w = $img->width() / 2; $h1 = $img->height() / 2; - $font_size = $w/20; + $font_size = $w / 20; $img->text($watermarktext, $w, $h1, function ($font) use ($v, $h, $font_size) { $font->file(public_path('Antonio-Bold.ttf')); $font->size($font_size); From 4dce22a898869721fedf54f1798c3c136784bc39 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 3 Feb 2020 16:04:57 +0300 Subject: [PATCH 4/4] #587 [sahibinden-module] Getting custom fields dynamically --- .../advs-module/resources/lang/en/field.php | 5 +++- .../Adv/Table/Filter/StatusFilterQuery.php | 28 +++++++++++++++++-- .../Http/Controller/Admin/AdvsController.php | 3 ++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index 44f71632b..ee835e2bf 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -85,8 +85,11 @@ return [ 'status' => [ 'name' => 'Status', 'option' => [ + 'approved' => 'Approved', 'expired' => 'Expired', - 'unpublished' => 'Unpublished' + 'unpublished' => 'Unpublished', + 'pending_admin' => 'Pending Admin', + 'pending_user' => 'Pending User' ] ], 'pending_adv' => [ diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Filter/StatusFilterQuery.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Filter/StatusFilterQuery.php index b6e7d11f7..57ac866c2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/Filter/StatusFilterQuery.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Filter/StatusFilterQuery.php @@ -2,19 +2,41 @@ use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Contract\FilterInterface; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Support\Carbon; class StatusFilterQuery { public function handle(Builder $query, FilterInterface $filter) { + if ($filter->getValue() == 'approved') { + $query + ->where('advs_advs.status', 'approved') + ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')); + } + if ($filter->getValue() == 'expired') { - $query->where('advs_advs.finish_at', '<=', Carbon::now()); + $query + ->where('advs_advs.finish_at', '<', date('Y-m-d H:i:s')) + ->WhereNotNull('advs_advs.finish_at'); } if ($filter->getValue() == 'unpublished') { - $query->where('advs_advs.status', '!=', 'approved'); + $query + ->where('advs_advs.status', 'passive'); + } + + if ($filter->getValue() == 'pending_admin') { + $query + ->where('advs_advs.status', 'pending_admin') + ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')) + ->orWhereNull('advs_advs.finish_at'); + } + + if ($filter->getValue() == 'pending_user') { + $query + ->where('advs_advs.status', 'pending_user') + ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')) + ->orWhereNull('advs_advs.finish_at'); } } } 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 80f1f08ca..311e6b30c 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 @@ -157,8 +157,11 @@ class AdvsController extends AdminController 'filter' => 'select', 'query' => StatusFilterQuery::class, 'options' => [ + 'approved' => 'visiosoft.module.advs::field.status.option.approved', 'expired' => 'visiosoft.module.advs::field.status.option.expired', 'unpublished' => 'visiosoft.module.advs::field.status.option.unpublished', + 'pending_admin' => 'visiosoft.module.advs::field.status.option.pending_admin', + 'pending_user' => 'visiosoft.module.advs::field.status.option.pending_user', ], ] ])