From c9e4dd1c6d056a21f021ed3c8565522f57b2a2e4 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 30 Apr 2021 18:15:09 +0300 Subject: [PATCH 1/4] =?UTF-8?q?#3892=20Abka.com.tr=20ihtiya=C3=A7lar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advs-module/resources/views/list/partials/list-filter.twig | 1 + .../advs-module/src/Http/Controller/AdvsController.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 9323ec8b7..b96b72255 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -30,6 +30,7 @@ 'mainCats':mainCats, 'subCats':subCats, 'ranges':ranges, + 'text':text, 'checkboxes':checkboxes, 'topfields' : topfields, 'selectDropdown' : selectDropdown, 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 e6c86fe37..503e35172 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -400,7 +400,7 @@ class AdvsController extends PublicController $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'param', 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', - 'seenList', 'radio', 'category', 'cityId', 'allCats', 'catText', 'cFArray'); + 'text', 'seenList', 'radio', 'category', 'cityId', 'allCats', 'catText', 'cFArray'); return $this->viewTypeBasedRedirect($viewType, $compact); } From 0a4f6a14405b431e3929cae06a34dd56d5320f41 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 30 Apr 2021 18:16:51 +0300 Subject: [PATCH 2/4] =?UTF-8?q?#3892=20Abka.com.tr=20ihtiya=C3=A7lar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/visiosoft/advs-module/resources/css/list-new.scss | 2 +- .../default/visiosoft/advs-module/resources/lang/en/field.php | 1 + .../advs-module/resources/views/list/partials/list-filter.twig | 2 +- .../advs-module/src/Http/Controller/AdvsController.php | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list-new.scss b/addons/default/visiosoft/advs-module/resources/css/list-new.scss index 00af852e2..1158b68fa 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list-new.scss +++ b/addons/default/visiosoft/advs-module/resources/css/list-new.scss @@ -230,7 +230,7 @@ ul { /* End Map */ /* Keyword */ - #keywordFilter { + #keywordFilter, .text-filter { input { font-size: calc(14rem / 16); } 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 4a91c0852..6719a34bf 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -345,6 +345,7 @@ return [ 'ads_with_map' => 'Ads With Map', 'advanced_sorting' => 'Advanced Sorting', 'filter_by_word' => 'Filter by word', + 'filter_by' => 'Filter by :name', 'free' => 'Free', 'ad_date' => 'Ad Date', diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index b96b72255..8572406bb 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -141,7 +141,7 @@
-
+
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 503e35172..0211bb05b 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -282,6 +282,7 @@ class AdvsController extends PublicController $selectImage = $returnvalues['selectImage']; $ranges = $returnvalues['ranges']; $radio = $returnvalues['radio']; + $text = $returnvalues['text']; $cFArray = app('Visiosoft\CustomfieldsModule\CustomField\Contract\CustomFieldRepositoryInterface') ->getCFParamValues($param); From 415161c2ba64f396277948a36478b1fe0b51b506 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 3 May 2021 13:35:44 +0300 Subject: [PATCH 3/4] #3915 abka filtreleme --- .../advs-module/resources/css/list-new.scss | 5 ++--- .../resources/views/list/partials/ads.twig | 15 ++++++++++++-- .../src/Http/Controller/AdvsController.php | 20 +++++++++++++++++-- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list-new.scss b/addons/default/visiosoft/advs-module/resources/css/list-new.scss index 1158b68fa..3abc7da39 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list-new.scss +++ b/addons/default/visiosoft/advs-module/resources/css/list-new.scss @@ -471,7 +471,7 @@ ul { background-color: #3F475F; font-weight: 400; font-size: calc(12rem / 16); - padding: .2rem; + padding: .2rem .5rem; &:first-child { border-top-left-radius: .25rem; @@ -495,7 +495,7 @@ ul { } td { - padding: .4rem 0; + padding: .4rem .5rem; & > a { img { @@ -559,7 +559,6 @@ ul { } &.location-data, &.date-data { - width: 13%; font-size: calc(13rem / 16); color: #707070; } diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig index bda048385..fcf352473 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig @@ -1,11 +1,16 @@ {% set hideStandard = setting_value('visiosoft.module.advs::hide_listing_standard_price') %} {% set listLocation = setting_value('visiosoft.module.location::list_page_location') %} -
+
+ + {% for cF in listingCFs %} + + {% endfor %} + {% if listLocation %} + {% endfor %} + {% if listLocation %}
{{ trans('visiosoft.module.advs::field.ad_title') }}{{ cF.name }} {{ trans('visiosoft.module.advs::field.city.name') }} @@ -38,12 +43,18 @@ {% if not setting_value('visiosoft.module.advs::hide_ad_cat') %}

{{ adv.cat1_name }} /{{ adv.cat2_name }}

{% endif %} -
+
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context})|raw }}
+ + {% for listingCF in listingCFs %} + {% set feature = adv.features[listingCF.slug.value] %} +
{{ feature ? feature.custom_field_value : '-' }}

{{ adv.country_name }}

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 0211bb05b..6bcbac644 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -271,7 +271,7 @@ class AdvsController extends PublicController $allCats = true; } - $cFArray = $checkboxes = $topfields = $selectDropdown = $selectRange = $selectImage = $ranges = $radio = array(); + $cFArray = $checkboxes = $topfields = $selectDropdown = $selectRange = $selectImage = $ranges = $radio = $listingCFs = array(); if ($isActiveCustomFields) { $returnvalues = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->index($mainCats, $subCats, $category); @@ -284,6 +284,22 @@ class AdvsController extends PublicController $radio = $returnvalues['radio']; $text = $returnvalues['text']; + $listingCFs = app('Visiosoft\CustomfieldsModule\CustomField\Contract\CustomFieldRepositoryInterface') + ->getSeenCustomFieldsWithCategory($category); + foreach ($advs as $adv) { + if ($adv->cf_json) { + $tempFeatures = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController') + ->view($adv); + $features = array(); + foreach ($listingCFs as $listingCF) { + if ($key = array_search($listingCF->slug, array_column($tempFeatures, 'slug'))) { + $features[$listingCF->slug] = $tempFeatures[$key]; + } + } + $adv->features = $features; + } + } + $cFArray = app('Visiosoft\CustomfieldsModule\CustomField\Contract\CustomFieldRepositoryInterface') ->getCFParamValues($param); } @@ -401,7 +417,7 @@ class AdvsController extends PublicController $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'param', 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', - 'text', 'seenList', 'radio', 'category', 'cityId', 'allCats', 'catText', 'cFArray'); + 'text', 'seenList', 'radio', 'category', 'cityId', 'allCats', 'catText', 'cFArray', 'listingCFs'); return $this->viewTypeBasedRedirect($viewType, $compact); } From 6e672a368cc20a1f17cccef9ebbb05030e65c742 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 3 May 2021 13:46:12 +0300 Subject: [PATCH 4/4] #3915 abka filtreleme --- .../advs-module/src/Http/Controller/AdvsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6bcbac644..5bebc56bb 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -271,7 +271,7 @@ class AdvsController extends PublicController $allCats = true; } - $cFArray = $checkboxes = $topfields = $selectDropdown = $selectRange = $selectImage = $ranges = $radio = $listingCFs = array(); + $cFArray = $checkboxes = $topfields = $selectDropdown = $selectRange = $selectImage = $ranges = $radio = $text = $listingCFs = array(); if ($isActiveCustomFields) { $returnvalues = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->index($mainCats, $subCats, $category);