From 5aa60780ee9a57a7a01d7a7915a946b4073cbc98 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 12 Apr 2021 10:52:36 +0300
Subject: [PATCH] #3472 listing design improvments - Integrate

---
 .../advs-module/resources/css/list-new.scss   | 13 ++--
 .../resources/views/list/list.twig            |  2 +-
 .../views/ads-list/partials/breadcrumb.twig   |  6 +-
 .../views/ads-list/partials/cat-filter.twig   | 66 ++++++-------------
 .../src/Category/CategoryModel.php            |  2 +-
 5 files changed, 34 insertions(+), 55 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 94be8d5d1..b10b4fa9a 100644
--- a/addons/default/visiosoft/advs-module/resources/css/list-new.scss
+++ b/addons/default/visiosoft/advs-module/resources/css/list-new.scss
@@ -101,11 +101,16 @@ ul {
         & > div {
           div {
             line-height: 1;
+
+            &.sub-cat {
+              margin-left: 1.65rem;
+            }
           }
 
           svg, img {
             width: 1.15rem;
             height: 1.15rem;
+            overflow: hidden;
             object-fit: contain;
             flex-shrink: 0;
           }
@@ -117,13 +122,13 @@ ul {
           }
 
           .sub-cat {
+            a {
+              font-size: calc(12rem / 16);
+            }
+
             li {
               margin-bottom: .25rem;
 
-              a {
-                font-size: calc(12rem / 16);
-              }
-
               ul {
                 padding-left: .5rem;
                 margin-top: .25rem;
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig
index b0088dc95..4e3546423 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig
@@ -57,7 +57,7 @@
                     </div>
                 {% endif %}
 
-                <div id="viewTypes" class="d-flex justify-content-between">
+                <div id="viewTypes" class="d-flex justify-content-end">
 
                     {{ addBlock('ads-list/partials/before-display-mode', {'topfields': topfields})|raw }}
 
diff --git a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb.twig b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb.twig
index 775c9ea56..6cf97dc5a 100644
--- a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/breadcrumb.twig
@@ -1,9 +1,9 @@
 {% if params.category %}
     {% for category_breadcrumbs in params.mainCats %}
         <span class="text-truncate">
-            <a href="{{ url_route('adv_list_seo', [category_breadcrumbs['slug']]) }}" data-toggle="tooltip"
-               data-placement="bottom" title="{{ category_breadcrumbs['val'] }}">
-                {{ category_breadcrumbs['val'] }}
+            <a href="{{ url_route('adv_list_seo', [category_breadcrumbs.slug]) }}" data-toggle="tooltip"
+               data-placement="bottom" title="{{ category_breadcrumbs.name }}">
+                {{ category_breadcrumbs.name }}
             </a>
         </span>
     {% endfor %}
diff --git a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig
index b7f071376..6813c3b3d 100644
--- a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/cat-filter.twig
@@ -4,56 +4,30 @@
 
         <li>
             <div class="d-flex">
-                {% if maincat.icon %}
-                    <img src="{{ maincat.icon.url }}" alt="{{ maincat.name }}">
-                {% else %}
-                    {{ img('visiosoft.module.advs::images/listing/sample-cat-icon.svg').data|raw }}
+                {% if (not categoryId) or (loop.first and categoryId) %}
+                    {% if maincat.icon %}
+                        <img src="{{ maincat.icon.url }}" alt="{{ maincat.name }}">
+                    {% else %}
+                        {{ img('visiosoft.module.advs::images/listing/sample-cat-icon.svg').data|raw }}
+                    {% endif %}
                 {% endif %}
-                <div class="ml-2">
-                    <a href="{{ appendRequestURL(request_query(),url_route('adv_list_seo', [maincat.slug, cityId.slug]),{},['page']) }}">
-                        {{ maincat.name }}
-                    </a>
-{#                    <ul class="sub-cat mt-1">#}
-{#                        {% for subcat in subCats %}#}
-{#                            {% if subcat.parent_category_id == maincat.id %}#}
-{#                                {% set subCatId = entries('cats', 'category').find(subcat.id) %}#}
-
-{#                                <li>#}
-{#                                    <a href="{{ appendRequestURL(request_query(), url_route('adv_list_seo', [subCatId.slug, citySlug]), {}, ['page']) }}">#}
-{#                                        {{ subcat.name }}#}
-{#                                    </a>#}
-{#                                    <ul>#}
-{#                                        <li>#}
-{#                                            <a href="#">Test</a>#}
-{#                                            <ul>#}
-{#                                                <li><a href="#">Test</a></li>#}
-{#                                                <li><a href="#">Test</a></li>#}
-{#                                                <li><a href="#">Test</a></li>#}
-{#                                                <li><a href="#">Test</a></li>#}
-{#                                                <li><a href="#">Test</a></li>#}
-{#                                                <li><a href="#">Test</a></li>#}
-{#                                            </ul>#}
-{#                                        </li>#}
-{#                                    </ul>#}
-{#                                </li>#}
-{#                            {% endif %}#}
-{#                        {% endfor %}#}
-{#                    </ul>#}
-                </div>
-            </div>
-        </li>
-
-        <li>
-            <div class="d-flex">
-                {% if maincat.icon %}
-                    <img src="{{ maincat.icon.url }}" alt="{{ maincat.name }}">
-                {% else %}
-                    {{ img('visiosoft.module.advs::images/listing/sample-cat-icon.svg').data|raw }}
-                {% endif %}
-                <div class="ml-2">
+                <div class="{{ not loop.first and categoryId ? 'sub-cat' : 'ml-2' }}" style="{{ not loop.first and categoryId ? 'padding-left: ' ~ (loop.index - 1) * 0.5 ~ 'rem;' }}">
                     <a href="{{ appendRequestURL(request_query(),url_route('adv_list_seo', [maincat.slug, cityId.slug]),{},['page']) }}">
                         {{ maincat.name }}
                     </a>
+                    {% if count(subCats) %}
+                        <ul class="sub-cat mt-1 ml-2">
+                            {% for subcat in subCats %}
+                                {% if subcat.parent_category_id == maincat.id %}
+                                    <li>
+                                        <a href="{{ appendRequestURL(request_query(), url_route('adv_list_seo', [subcat.slug, citySlug]), {}, ['page']) }}">
+                                            {{ subcat.name }}
+                                        </a>
+                                    </li>
+                                {% endif %}
+                            {% endfor %}
+                        </ul>
+                    {% endif %}
                 </div>
             </div>
         </li>
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index 4d4ac2bbf..e9fcd5163 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -178,7 +178,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
         $categories = array();
         $z = 1;
         for ($i = 1; $i <= $z; $i++) {
-            if ($main = $this->newQuery()->where('id', $id)->first()->select('id', 'name', 'slug', '')) {
+            if ($main = $this->find($id)) {
                 $categories[] = $main;
                 if ($main->parent_category_id != null) {
                     $id = $main->parent_category_id;