From c4002bf55dfce0aaceadb415d297c78588bb7b52 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 20 Feb 2020 15:27:11 +0300
Subject: [PATCH 1/2] #976 remove store code for advs module

---
 .../resources/views/list/list.twig            |  2 +-
 .../views/list/partials/user-section.twig     | 29 -------------------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig

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 4b3b36139..9b8517b42 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig
@@ -9,7 +9,7 @@
             {% include "visiosoft.module.advs::list/partials/breadcrumb" %}
             <!-- breadcrumb -->
 
-            {% include "visiosoft.module.advs::list/partials/user-section" %}
+            {{ addBlock('ads-list/user-section', {'store': store})|raw }}
 
             <div class="row my-3">
                 <div class="col-md-3">
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig
deleted file mode 100644
index 3330ae7f8..000000000
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig
+++ /dev/null
@@ -1,29 +0,0 @@
-{% if store %}
-    {% if store.store_banner is null %}
-        {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %}
-    {% else %}
-        {% set background_image = store.store_banner.url %}
-    {% endif %}
-    <div class="upper-list-banner" style="background-image: url('{{ background_image }}');">
-        <div class="row">
-            <div class="col-md-3 col-xs-3">
-                <div class="card m-4">
-                    {% if store.file is null %}
-                        <img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}" class="card-img-top">
-                    {% else %}
-                        <img src="{{ store.file.url }}" class="card-img-top">
-                    {% endif %}
-                    <div class="card-body">
-                        <h5 class="card-title text-center mb-0">{{ store.name }}</h5>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% if store.user_id == auth_user().id %}
-        <div class="p-2 bg-secondary rounded my-2">
-            <a href="{{ url_route('store::edit', [store.slug, store.id]) }}" class="btn btn-primary text-light">Edit</a>
-            <a href="{{ url_route('store::add-user', [store.slug]) }}" class="btn btn-success text-light">Add Users</a>
-        </div>
-    {% endif %}
-{% endif %}
\ No newline at end of file

From c30ad70fd3d11442909d549dcb764788a92db3ea Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 20 Feb 2020 16:14:33 +0300
Subject: [PATCH 2/2] #971 Follow-up from "#920 [core] When you select photos
 with ads after searhing it disappers"

---
 .../views/list/partials/list-filter.twig      | 72 +++++++------------
 .../views/list/partials/price-filter.twig     | 41 +++++++++++
 2 files changed, 65 insertions(+), 48 deletions(-)
 create mode 100644 addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig

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 4d22cad4e..45d3ecdfd 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
@@ -39,6 +39,10 @@
                             'param':param
                         })|raw }}
 
+                        <!-- Price Filter Start -->
+                        {% include 'visiosoft.module.advs::list/partials/price-filter' %}
+                        <!-- Price Filter End -->
+
                         <!-- Date Filter Start -->
                         <div class="card mb-3">
                             <div class="card-header breadcrumb mb-0" id="dateHeading">
@@ -55,21 +59,33 @@
                                  style="max-height: 300px;">
                                 <div class="d-flex flex-column p-3 m-0">
                                     <div class="form-check py-1">
-                                        <input class="form-check-input" type="radio" name="date" id="dateDay"
+                                        <input class="form-check-input"
+                                                {% if app.request.get('date') == 'day' %}
+                                                    checked
+                                                {% endif %}
+                                               type="radio" name="date" id="dateDay"
                                                value="day">
                                         <label class="form-check-label" for="dateDay">
                                             {{ trans("visiosoft.module.advs::field.in_the_last_24_hours.name") }}
                                         </label>
                                     </div>
                                     <div class="form-check py-1">
-                                        <input class="form-check-input" type="radio" name="date" id="dateWeek"
+                                        <input class="form-check-input"
+                                                {% if app.request.get('date') == 'week' %}
+                                                    checked
+                                                {% endif %}
+                                               type="radio" name="date" id="dateWeek"
                                                value="week">
                                         <label class="form-check-label" for="dateWeek">
                                             {{ trans("visiosoft.module.advs::field.in_the_last_week.name") }}
                                         </label>
                                     </div>
                                     <div class="form-check py-1">
-                                        <input class="form-check-input" type="radio" name="date" id="dateMonth"
+                                        <input class="form-check-input"
+                                                {% if app.request.get('date') == 'month' %}
+                                                    checked
+                                                {% endif %}
+                                               type="radio" name="date" id="dateMonth"
                                                value="month">
                                         <label class="form-check-label" for="dateMonth">
                                             {{ trans("visiosoft.module.advs::field.in_the_last_month.name") }}
@@ -140,7 +156,11 @@
                                  style="max-height: 300px;">
                                 <div class="row p-3 m-0">
                                     <div class="form-check py-1">
-                                        <input class="form-check-input" type="checkbox" value="true" name="map"
+                                        <input class="form-check-input" type="checkbox"
+                                                {% if app.request.get('map') == true %}
+                                                    checked
+                                                {% endif %}
+                                               value="true" name="map"
                                                id="mapFilter">
                                         <label class="form-check-label" for="mapFilter">
                                             {{ trans("visiosoft.module.advs::field.yes.name") }}
@@ -151,50 +171,6 @@
                         </div>
                         <!-- Map Filter End -->
 
-                        <!-- Price Filter Start -->
-                        <div class="card mb-3">
-                            <div class="card-header breadcrumb mb-0" id="priceHeading">
-                                <h5 class="mb-0">
-                                    <button class="btn btn-link text-dark" data-toggle="collapse" data-target="#price"
-                                            aria-expanded="true" aria-controls="price">
-                                        <i class="fas fa-money-bill"></i>
-                                        {{ trans("visiosoft.module.advs::field.price.name") }}
-                                    </button>
-                                </h5>
-                            </div>
-                            <div id="price" class="collapse show overflow-auto" aria-labelledby="priceHeading"
-                                 data-parent="#filter"
-                                 style="max-height: 300px;">
-                                <div class="row p-0 m-0">
-                                    {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
-                                    <div class="col-md-4 p-1 m-0">
-                                        <input type="number" class="price-input form-control w-100"
-                                               value="{{ app.request.get('min_price') }}"
-                                               name="min_price" min="0"
-                                               placeholder="{{ trans('visiosoft.module.advs::field.min.name') }}">
-                                    </div>
-                                    <div class="col-md-4 p-1 pr-0 m-0">
-                                        <input class="price-input form-control w-100" type="number"
-                                               value="{{ app.request.get('max_price') }}"
-                                               name="max_price"
-                                               placeholder="{{ trans('visiosoft.module.advs::field.max.name') }}">
-
-                                    </div>
-                                    <div class="col-md-4 py-1 px-0">
-                                        <select name="currency" id="currency" class="form-control">
-                                            {% for currency in active_currencies %}
-                                                <option {% if app.request.get('currency') == currency %}
-                                                        selected
-                                                        {% endif %}value="{{ currency }}">{{ currency_symbol(currency) }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </div>
-
-                                </div>
-                            </div>
-                        </div>
-                        <!-- Price Filter End -->
-
                         <div class="card">
                             <div class="card-header bg-primary text-center" id="submitHeading">
                                 <h5 class="mb-0">
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
new file mode 100644
index 000000000..c7cd9f17b
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
@@ -0,0 +1,41 @@
+<div class="card mb-3">
+    <div class="card-header breadcrumb mb-0" id="priceHeading">
+        <h5 class="mb-0">
+            <button class="btn btn-link text-dark" data-toggle="collapse" data-target="#price"
+                    aria-expanded="true" aria-controls="price">
+                <i class="fas fa-money-bill"></i>
+                {{ trans("visiosoft.module.advs::field.price.name") }}
+            </button>
+        </h5>
+    </div>
+    <div id="price" class="collapse show overflow-auto" aria-labelledby="priceHeading"
+         data-parent="#filter"
+         style="max-height: 300px;">
+        <div class="row p-0 m-0">
+            {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
+            <div class="col-md-4 p-1 m-0">
+                <input type="number" class="price-input form-control w-100"
+                       value="{{ app.request.get('min_price') }}"
+                       name="min_price" min="0"
+                       placeholder="{{ trans('visiosoft.module.advs::field.min.name') }}">
+            </div>
+            <div class="col-md-4 p-1 pr-0 m-0">
+                <input class="price-input form-control w-100" type="number"
+                       value="{{ app.request.get('max_price') }}"
+                       name="max_price"
+                       placeholder="{{ trans('visiosoft.module.advs::field.max.name') }}">
+
+            </div>
+            <div class="col-md-4 py-1 px-0">
+                <select name="currency" id="currency" class="form-control">
+                    {% for currency in active_currencies %}
+                        <option {% if app.request.get('currency') == currency %}
+                                selected
+                                {% endif %}value="{{ currency }}">{{ currency_symbol(currency) }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+
+        </div>
+    </div>
+</div>
\ No newline at end of file