From 1fad2eb43fe9db9db5e845d3d8848a8c6fc9ef53 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 14 Oct 2021 17:00:23 +0300
Subject: [PATCH 1/2] fix

---
 .../resources/views/admin/table/table.twig     | 18 +++++++++++-------
 .../src/Adv/Table/AdvTableBuilder.php          |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig b/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig
index ac310ce5b..f6a391ff8 100644
--- a/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -15,11 +15,11 @@
 
     {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
-    {% if not table.rows.empty() %}
+    {% if not table.rows.isEmpty() %}
         {% block card %}
             <div class="card">
 
-                {{ form_open({ 'url': url_full() }) }}
+                {{ form_open({ 'url': table.options.url ?: url_full() }) }}
                 <div class="table-stack">
                     <table
                             class="
@@ -39,13 +39,15 @@
                                     {% if table.options.sortable %}
                                         <td>
                                             {{ icon('fa fa-arrows handle') }}
-                                            <input type="hidden" name="{{ row.table.options.prefix }}order[]" value="{{ row.key }}"/>
+                                            <input type="hidden" name="{{ row.table.options.prefix }}order[]"
+                                                   value="{{ row.key }}"/>
                                         </td>
                                     {% endif %}
 
-                                    {% if not table.actions.empty() %}
+                                    {% if not table.actions.isEmpty() %}
                                         <td>
-                                            <input type="checkbox" data-toggle="action" name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/>
+                                            <input type="checkbox" data-toggle="action"
+                                                   name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/>
                                         </td>
                                     {% endif %}
 
@@ -83,8 +85,10 @@
                 </div>
             </div>
         {% endblock %}
+
     {% endif %}
+
 </div>
 <script>
     var advanced_update_url = "{{ url_route('visiosoft.module.advs::ajax_multiple_update') }}";
-</script>
+</script>
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php
index 364106ebe..c4e3d946e 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php
@@ -51,7 +51,9 @@ class AdvTableBuilder extends TableBuilder
     protected $options = [
         'order_by' => [
             'id' => 'DESC',
-        ]
+        ],
+        'table_view' => 'visiosoft.module.advs::admin/table/table'
+
     ];
 
     protected $assets = [

From 742dce6f08de24d59e8f4106b198a3bf57fda10b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 14 Oct 2021 17:38:38 +0300
Subject: [PATCH 2/2] fix listing

---
 .../visiosoft/advs-module/resources/views/list/list.twig        | 2 +-
 .../advs-module/resources/views/list/partials/mobile-list.twig  | 2 ++
 .../defaultadmin-theme/src/Listener/AddViewAdsButton.php        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

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 9f2066468..cb08f0329 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig
@@ -21,7 +21,7 @@
                 <div id="pageTitle" class="d-flex justify-content-between border-bottom pb-2 px-3 mb-3">
                     <p>
                         {{ trans('visiosoft.module.advs::field.search_ad_result_text', {
-                            'count': advs.total,
+                            'count': (advs.total+featured_advs.total),
                             'name': catText ? catText : '',
                         })|raw }}
                     </p>
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
index 5dc3e5db5..686b87377 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
@@ -25,6 +25,8 @@
     {% endif %}
 
     <div id="mobileListing">
+        {{ addBlock('ad-list/partials/mobile-list', {'featured_advs': featured_advs, 'vars': _context})|raw }}
+
         {% for adv in advs %}
             <a href="{{ adv.detail_url }}" class="listing-item d-flex p-2">
                 <img src="{{ adv.cover_photo }}" alt="{{ adv.name }}" class="rounded-sm">
diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php
index 2ec46d7eb..7fb34e265 100644
--- a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php
+++ b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php
@@ -45,7 +45,7 @@ class AddViewAdsButton
             $dropdown = array_merge($buttons['settings']['dropdown'], [
                 "ads" => [
                     "text" => trans('visiosoft.theme.defaultadmin::button.view_ads'),
-                    "href" => "admin/advs?filter_User={entry.id}"
+                    "href" => "admin/advs?filter_user={entry.id}"
                 ]
             ]);
             $buttons['settings']['dropdown'] = $dropdown;