From de5ac7e56fb978d86b156f01ecf243ff91b3dcf8 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 17 Aug 2020 12:37:33 +0300
Subject: [PATCH 1/8] another lang redirect without url lang

---
 .../src/AdvsModuleServiceProvider.php         |  2 +
 .../Http/Middleware/redirectDiffrentLang.php  | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php

diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index a9ca7f186..13e5a4dfd 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -10,6 +10,7 @@ use Visiosoft\AdvsModule\Adv\AdvRepository;
 use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel;
 use Visiosoft\AdvsModule\Adv\AdvModel;
 use Visiosoft\AdvsModule\Adv\Form\AdvFormBuilder;
+use Visiosoft\AdvsModule\Http\Middleware\redirectDiffrentLang;
 use Visiosoft\AdvsModule\Http\Middleware\SetLang;
 use Visiosoft\AdvsModule\Listener\AddAdvsSettingsScript;
 use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
@@ -233,6 +234,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
      */
     protected $middleware = [
         SetLang::class,
+        redirectDiffrentLang::class,
     ];
 
     /**
diff --git a/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php b/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php
new file mode 100644
index 000000000..dd71ae2ca
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php
@@ -0,0 +1,50 @@
+<?php namespace Visiosoft\AdvsModule\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Redirector;
+
+/**
+ * Class SetLang
+ */
+class redirectDiffrentLang
+{
+
+    /**
+     * The redirect utility.
+     *
+     * @var Redirector
+     */
+    protected $redirect;
+
+    /**
+     * Create a new SetLocale instance.
+     *
+     * @param Redirector $redirect
+     */
+    public function __construct(
+        Redirector $redirect
+    )
+    {
+        $this->redirect = $redirect;
+    }
+
+    public function handle(Request $request, Closure $next)
+    {
+        $original_url = $request->server->get('ORIGINAL_REQUEST_URI');
+        $setting_language = setting_value('streams::default_locale');
+        $current_language = $request->session()->get('_locale', $setting_language);
+        $request_url = ltrim($request->getRequestUri(), '/');
+        if ($current_language != $setting_language) {
+            if ($request_url != "" and $original_url != '/' . $current_language . '/' . $request_url) {
+                return $this->redirect->to('/' . $current_language . '/' . $request_url);
+            }
+        } else {
+            if ($request_url == "" and '/' . $current_language != $original_url) {
+                $this->redirect->to($current_language);
+            }
+        }
+
+        return $next($request);
+    }
+}

From 75d01e620dd95816fc0548d413a7e31744023510 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 17 Aug 2020 13:26:33 +0300
Subject: [PATCH 2/8] remove old functions

---
 .../visiosoft/advs-module/resources/js/list.js      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js
index ede10715c..f02f22799 100644
--- a/addons/default/visiosoft/advs-module/resources/js/list.js
+++ b/addons/default/visiosoft/advs-module/resources/js/list.js
@@ -40,13 +40,6 @@ $('.sort-by-item').on('click', function () {
     window.location.replace(goURL);
 });
 
-
-$('.ad-info-right-bar-video').on('click', function () {
-    $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].play();
-    $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].controls = false;
-});
-
-
 $(document).ready(function () {
     let searchParams = new URLSearchParams(window.location.search);
 
@@ -167,12 +160,6 @@ $(document).ready(function () {
     });
 });
 
-$('.ad-info-right-bar-video').tooltip({
-    animated: 'fade',
-    placement: 'bottom',
-    html: true
-});
-
 $("#listFilterForm").submit(function(e) {
     const inputs = $('#listFilterForm :input');
     [...inputs].forEach((input) => {

From 6381dcc53a42183d21feda13c25a40353d5e26e9 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 18 Aug 2020 11:22:10 +0300
Subject: [PATCH 3/8] remove page params for change category

---
 .../src/Adv/Command/appendRequestURL.php      | 28 ++++++++++++++-----
 .../advs-module/src/AdvsModulePlugin.php      |  4 +--
 .../views/ads-list/partials/list-filter.twig  |  8 +++---
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php
index fbba5a48d..0c1d7eb93 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php
@@ -11,16 +11,18 @@ class appendRequestURL
     protected $request;
     protected $url;
     protected $new_parameters;
+    protected $remove_parameters;
 
     /**
      * appendRequestURL constructor.
      * @param $request
      */
-    public function __construct($request, $url, $new_parameters = [])
+    public function __construct($request, $url, $new_parameters = [], $remove_parameters = [])
     {
         $this->url = $url;
         $this->request = $request;
         $this->new_parameters = $new_parameters;
+        $this->remove_parameters = $remove_parameters;
     }
 
     /**
@@ -28,20 +30,23 @@ class appendRequestURL
      */
     public function handle()
     {
-        if (count($this->new_parameters) === 0 && count($this->request) === 0) {
+
+        $request = $this->removeParameters($this->request);
+
+        if (count($this->new_parameters) === 0 && count($request) === 0) {
             return $this->url;
-        } elseif (count($this->new_parameters) > 0 && count($this->request) > 0) {
+        } elseif (count($this->new_parameters) > 0 && count($request) > 0) {
             return $this->url
                 . (Str::contains($this->url, '?') ? '&' : '?')
-                . Arr::query($this->appends(array_merge($this->request, $this->new_parameters)));
-        } elseif (count($this->new_parameters) > 0 && count($this->request) === 0) {
+                . Arr::query($this->appends(array_merge($request, $this->new_parameters)));
+        } elseif (count($this->new_parameters) > 0 && count($request) === 0) {
             return $this->url
                 . (Str::contains($this->url, '?') ? '&' : '?')
                 . Arr::query($this->appends($this->new_parameters));
-        } elseif (count($this->new_parameters) === 0 && count($this->request) > 0) {
+        } elseif (count($this->new_parameters) === 0 && count($request) > 0) {
             return $this->url
                 . (Str::contains($this->url, '?') ? '&' : '?')
-                . Arr::query($this->appends($this->request));
+                . Arr::query($this->appends($request));
         }
     }
 
@@ -87,4 +92,13 @@ class appendRequestURL
 
         return $this;
     }
+
+    public function removeParameters(array $array)
+    {
+        foreach ($this->remove_parameters as $parameter) {
+            unset($array[$parameter]);
+        }
+
+        return $array;
+    }
 }
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
index b21686d59..6078ea99b 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
@@ -57,9 +57,9 @@ class AdvsModulePlugin extends Plugin
             ),
             new \Twig_SimpleFunction(
                 'appendRequestURL',
-                function ($request, $url, $new_parameters) {
+                function ($request, $url, $new_parameters, $removeParams = []) {
 
-                    return $this->dispatch(new appendRequestURL($request, $url, $new_parameters));
+                    return $this->dispatch(new appendRequestURL($request, $url, $new_parameters, $removeParams));
                 }
             ),
             new \Twig_SimpleFunction(
diff --git a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
index 6406321d6..7f1debffe 100644
--- a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
@@ -29,9 +29,9 @@
                     {% set citySlug = pathInfo[3] %}
                 {% endif %}
                 <a href="{% if(viewType != "map") %}
-                    {{ appendRequestURL(request_query(),url_route('adv_list_seo', [catId.slug, citySlug]),{}) }}
+                    {{ appendRequestURL(request_query(),url_route('adv_list_seo', [catId.slug, citySlug]),{},['page']) }}
                 {% else %}
-                    {{ appendRequestURL(request_query(),url_route('advs_map_list'),{'cat':id}) }}
+                    {{ appendRequestURL(request_query(),url_route('advs_map_list'),{'cat':id},['page']) }}
                 {% endif %}" class="list-group-item list-group-item-action text-truncate">
                     <i class="fas fa-dot-circle"></i>
                     {{ name }}
@@ -41,9 +41,9 @@
                         {% if subcat.parent_category_id == maincat['id'] %}
                             {% set subCatId = entries('cats', 'category').find(subcat.id) %}
                             <a href="{% if(viewType != "map") %}
-                                {{ appendRequestURL(request_query(),url_route('adv_list_seo', [subCatId.slug, citySlug]),{}) }}
+                                {{ appendRequestURL(request_query(),url_route('adv_list_seo', [subCatId.slug, citySlug]),{},['page']) }}
                             {% else %}
-                                {{ appendRequestURL(request_query(),url_route('advs_map_list'),{'cat':subcat.id}) }}
+                                {{ appendRequestURL(request_query(),url_route('advs_map_list'),{'cat':subcat.id},['page']) }}
                             {% endif %}" class="list-group-item list-group-item-action text-truncate">
                                 {{ subcat.name }}
                             </a>

From b69caea84f69110c610e438f9f1eac2d3d91c9fb Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 18 Aug 2020 12:02:20 +0300
Subject: [PATCH 4/8] filter optional

---
 .../resources/config/settings/sections.php    |   6 +
 .../resources/config/settings/settings.php    |  27 ++
 .../advs-module/resources/lang/en/section.php |   1 +
 .../advs-module/resources/lang/en/setting.php |  13 +
 .../views/list/partials/list-filter.twig      | 351 +++++++++---------
 .../views/list/partials/price-filter.twig     |  77 ++--
 .../views/ads-list/partials/list-filter.twig  |   3 +-
 .../resources/config/settings/sections.php    |   6 +
 .../resources/config/settings/settings.php    |   7 +
 .../resources/lang/en/section.php             |   1 +
 .../resources/lang/en/setting.php             |   4 +
 .../views/ads-list/partials/list-filter.twig  |  43 +--
 12 files changed, 309 insertions(+), 230 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
index 0ccb51009..50d32db0f 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
@@ -43,6 +43,12 @@ return [
                     'register_email_field',
                 ],
             ],
+            'filter' => [
+                'title' => 'visiosoft.module.advs::section.filter',
+                'fields' => [
+                    'hide_price_filter','hide_date_filter','hide_photo_filter','hide_map_filter'
+                ],
+            ],
         ],
     ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
index 6bc7c9c99..8a69b1286 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
@@ -201,4 +201,31 @@ return [
             'default_value' => true,
         ],
     ],
+
+    'hide_price_filter' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ]
+    ],
+
+    'hide_date_filter' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ]
+    ],
+
+    'hide_photo_filter' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ]
+    ],
+    'hide_map_filter' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ]
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php
index d59a01842..926f1c534 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php
@@ -40,6 +40,7 @@ return [
     'general' => 'General',
     'ads' => 'Ads',
     'user' => 'User',
+    'filter' => 'Filter',
     'options' => [
         'title' => 'Options',
     ],
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
index b1aaeb21a..026e78216 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
@@ -133,4 +133,17 @@ return [
     'market_place' => [
         'name' => 'Market Place',
     ],
+
+    'hide_price_filter' => [
+        'name' => 'Hide Price Filter',
+    ],
+    'hide_date_filter' => [
+        'name' => 'Hide Date Filter',
+    ],
+    'hide_photo_filter' => [
+        'name' => 'Hide Photo Filter',
+    ],
+    'hide_map_filter' => [
+        'name' => 'Hide Map Filter',
+    ],
 ];
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 bd87c0b30..4c51702b9 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
@@ -1,191 +1,202 @@
 {% set formHtml %}
-    <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get" id="listFilterForm">
-{% endset %}
-{% set catSlug = null %}
-{% set citySlug = null %}
-{% set pathInfo = app.request.pathinfo|split('/') %}
-{% if pathInfo[1] == 'c' %}
-    {% set catSlug = pathInfo[2] %}
-{% endif %}
-{% if pathInfo|length is same as(4) %}
-    {% set citySlug = pathInfo[3] %}
-{% endif %}
-{% if catSlug %}
-    {% set formHtml %}
-        <form action="{{ url_route('adv_list_seo', [catSlug, citySlug]) }}" method="get" id="listFilterForm">
+<form action="{{ url_route('visiosoft.module.advs::list') }}" method="get" id="listFilterForm">
     {% endset %}
-{% endif %}
-{{ formHtml }}
-    <div class="row">
-        <input type="hidden" name="cat" value="{{ app.request.get('cat') }}">
-        <input type="hidden" name="user" value="{{ app.request.get('user') }}">
-        <div class="col-md-12 px-4">
-            <div class="row">
-                <div id="filter" class="w-100 mb-3">
+    {% set catSlug = null %}
+    {% set citySlug = null %}
+    {% set pathInfo = app.request.pathinfo|split('/') %}
+    {% if pathInfo[1] == 'c' %}
+        {% set catSlug = pathInfo[2] %}
+    {% endif %}
+    {% if pathInfo|length is same as(4) %}
+        {% set citySlug = pathInfo[3] %}
+    {% endif %}
+    {% if catSlug %}
+    {% set formHtml %}
+    <form action="{{ url_route('adv_list_seo', [catSlug, citySlug]) }}" method="get" id="listFilterForm">
+        {% endset %}
+        {% endif %}
+        {{ formHtml }}
+        <div class="row">
+            <input type="hidden" name="cat" value="{{ app.request.get('cat') }}">
+            <input type="hidden" name="user" value="{{ app.request.get('user') }}">
+            <div class="col-md-12 px-4">
+                <div class="row">
+                    <div id="filter" class="w-100 mb-3">
 
-                    {{ addBlock('ads-list/partials/list-filter',{
-                        'mainCats':mainCats,
-                        'subCats':subCats,
-                        'ranges':ranges,
-                        'checkboxes':checkboxes,
-                        'topfields' : topfields,
-                        'selectDropdown' : selectDropdown,
-                        'selectRange' : selectRange,
-                        'selectImage' : selectImage,
-                        'radio':radio,
-                        'countries':countries,
-                        'cities':cities,
-                        'districts':districts,
-                        'neighborhoods':neighborhoods,
-                        'villages':villages,
-                        'param':param,
-                        'categoryId':categoryId,
-                        'cityId':cityId,
-                        '_ORDER_':['visiosoft.module.cats', 'visiosoft.module.location']
-                    })|raw }}
+                        {{ addBlock('ads-list/partials/list-filter',{
+                            'mainCats':mainCats,
+                            'subCats':subCats,
+                            'ranges':ranges,
+                            'checkboxes':checkboxes,
+                            'topfields' : topfields,
+                            'selectDropdown' : selectDropdown,
+                            'selectRange' : selectRange,
+                            'selectImage' : selectImage,
+                            'radio':radio,
+                            'countries':countries,
+                            'cities':cities,
+                            'districts':districts,
+                            'neighborhoods':neighborhoods,
+                            'villages':villages,
+                            'param':param,
+                            'categoryId':categoryId,
+                            'cityId':cityId,
+                            '_ORDER_':['visiosoft.module.cats', 'visiosoft.module.location']
+                        })|raw }}
 
-                    <!-- Price Filter Start -->
-                    {% include 'visiosoft.module.advs::list/partials/price-filter' %}
-                    <!-- Price Filter End -->
+                        <!-- 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">
-                            <h5 class="mb-0">
-                                <button class="btn btn-link text-dark d-flex align-items-center" data-toggle="collapse" data-target="#date"
-                                        aria-expanded="true" aria-controls="date">
-                                    <img src="{{ img('visiosoft.module.advs::images/date-icon.svg').url }}" class="mr-2"
-                                         alt="date icon">
-                                    <span>{{ trans("visiosoft.module.advs::field.date.name") }}</span>
-                                </button>
-                            </h5>
-                        </div>
-                        <div id="dateContainer" class="collapse show overflow-auto" aria-labelledby="dateHeading"
-                             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"
-                                            {% 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>
+                        {% if setting_value('visiosoft.module.advs::hide_date_filter') == false %}
+                            <!-- Date Filter Start -->
+                            <div class="card mb-3">
+                                <div class="card-header breadcrumb mb-0" id="dateHeading">
+                                    <h5 class="mb-0">
+                                        <button class="btn btn-link text-dark d-flex align-items-center"
+                                                data-toggle="collapse" data-target="#dateContainer"
+                                                aria-expanded="true" aria-controls="dateContainer">
+                                            <img src="{{ img('visiosoft.module.advs::images/date-icon.svg').url }}"
+                                                 class="mr-2"
+                                                 alt="date icon">
+                                            <span>{{ trans("visiosoft.module.advs::field.date.name") }}</span>
+                                        </button>
+                                    </h5>
                                 </div>
-                                <div class="form-check py-1">
-                                    <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"
-                                            {% 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") }}
-                                    </label>
+                                <div id="dateContainer" class="collapse show overflow-auto"
+                                     aria-labelledby="dateHeading"
+                                     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"
+                                                    {% 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"
+                                                    {% 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"
+                                                    {% 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") }}
+                                            </label>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                    <!-- Date Filter End -->
+                            <!-- Date Filter End -->
+                        {% endif %}
 
-                    <!-- Media Filter Start -->
-                    <div class="card mb-3">
-                        <div class="card-header breadcrumb mb-0" id="mediaHeading">
-                            <h5 class="mb-0">
-                                <button class="btn btn-link text-dark" data-toggle="collapse" data-target="#media"
-                                        aria-expanded="true" aria-controls="media">
-                                    <i class="fa fa-camera"></i>
-                                    {{ trans("visiosoft.module.advs::field.photo.name") }}
-                                    , {{ trans("visiosoft.module.advs::field.video.name") }}
-                                </button>
-                            </h5>
-                        </div>
-                        <div id="mediaContainer" class="collapse show overflow-auto" aria-labelledby="mediaHeading"
-                             style="max-height: 300px;">
-                            <div class="d-flex p-3 m-0 flex-column">
-                                <div class="form-check py-1">
-                                    <input class="form-check-input" type="checkbox"
-                                        {% if app.request.get('photo') == true %}
-                                            checked
-                                        {% endif %}
-                                           value="true" name="photo"
-                                           id="photo">
-                                    <label class="form-check-label" for="photo">
-                                        {{ trans("visiosoft.module.advs::field.ads_with_photo.name") }}
-                                    </label>
+                        {% if setting_value('visiosoft.module.advs::hide_photo_filter') == false %}
+                            <!-- Media Filter Start -->
+                            <div class="card mb-3">
+                                <div class="card-header breadcrumb mb-0" id="mediaHeading">
+                                    <h5 class="mb-0">
+                                        <button class="btn btn-link text-dark" data-toggle="collapse"
+                                                data-target="#mediaContainer"
+                                                aria-expanded="true" aria-controls="mediaContainer">
+                                            <i class="fa fa-camera"></i>
+                                            {{ trans("visiosoft.module.advs::field.photo.name") }}
+                                            , {{ trans("visiosoft.module.advs::field.video.name") }}
+                                        </button>
+                                    </h5>
                                 </div>
-                                <div class="form-check py-1">
-                                    <input class="form-check-input" type="checkbox"
-                                           {% if app.request.get('video') == true %}
-                                               checked
-                                           {% endif %}
-                                           value="true" name="video"
-                                           id="video">
-                                    <label class="form-check-label" for="video">
-                                        {{ trans("visiosoft.module.advs::field.ads_with_video.name") }}
-                                    </label>
+                                <div id="mediaContainer" class="collapse show overflow-auto"
+                                     aria-labelledby="mediaHeading"
+                                     style="max-height: 300px;">
+                                    <div class="d-flex p-3 m-0 flex-column">
+                                        <div class="form-check py-1">
+                                            <input class="form-check-input" type="checkbox"
+                                                    {% if app.request.get('photo') == true %}
+                                                        checked
+                                                    {% endif %}
+                                                   value="true" name="photo"
+                                                   id="photo">
+                                            <label class="form-check-label" for="photo">
+                                                {{ trans("visiosoft.module.advs::field.ads_with_photo.name") }}
+                                            </label>
+                                        </div>
+                                        <div class="form-check py-1">
+                                            <input class="form-check-input" type="checkbox"
+                                                    {% if app.request.get('video') == true %}
+                                                        checked
+                                                    {% endif %}
+                                                   value="true" name="video"
+                                                   id="video">
+                                            <label class="form-check-label" for="video">
+                                                {{ trans("visiosoft.module.advs::field.ads_with_video.name") }}
+                                            </label>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                    <!-- Media Filter End -->
+                            <!-- Media Filter End -->
+                        {% endif %}
 
-                    <!-- Map Filter Start -->
-                    <div class="card mb-3">
-                        <div class="card-header breadcrumb mb-0" id="mapHeading">
-                            <h5 class="mb-0">
-                                <button class="btn btn-link text-dark" data-toggle="collapse"
-                                        data-target="#mapFilter"
-                                        aria-expanded="true" aria-controls="mapFilter">
-                                    <i class="fa fa-map"></i>
-                                    {{ trans("visiosoft.module.advs::field.map.name") }}
-                                </button>
-                            </h5>
-                        </div>
-                        <div id="mapContainer" class="collapse show overflow-auto" aria-labelledby="mapHeading"
-                             style="max-height: 300px;">
-                            <div class="row p-3 m-0">
-                                <div class="form-check py-1">
-                                    <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") }}
-                                    </label>
+                        {% if setting_value('visiosoft.module.advs::hide_map_filter') == false %}
+                            <!-- Map Filter Start -->
+                            <div class="card mb-3">
+                                <div class="card-header breadcrumb mb-0" id="mapHeading">
+                                    <h5 class="mb-0">
+                                        <button class="btn btn-link text-dark" data-toggle="collapse"
+                                                data-target="#mapContainer"
+                                                aria-expanded="true" aria-controls="mapContainer">
+                                            <i class="fa fa-map"></i>
+                                            {{ trans("visiosoft.module.advs::field.map.name") }}
+                                        </button>
+                                    </h5>
+                                </div>
+                                <div id="mapContainer" class="collapse show overflow-auto" aria-labelledby="mapHeading"
+                                     style="max-height: 300px;">
+                                    <div class="row p-3 m-0">
+                                        <div class="form-check py-1">
+                                            <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") }}
+                                            </label>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                    <!-- Map Filter End -->
+                            <!-- Map Filter End -->
+                        {% endif %}
 
-                    <div class="card">
-                        <div class="card-header bg-primary text-center" id="submitHeading">
-                            <h5 class="mb-0">
-                                <button class="btn btn-link text-white w-100">
-                                    <i class="fas fa-search"></i>
-                                    {{ trans("visiosoft.module.advs::field.search") }}
-                                </button>
-                            </h5>
+                        <div class="card">
+                            <div class="card-header bg-primary text-center" id="submitHeading">
+                                <h5 class="mb-0">
+                                    <button class="btn btn-link text-white w-100">
+                                        <i class="fas fa-search"></i>
+                                        {{ trans("visiosoft.module.advs::field.search") }}
+                                    </button>
+                                </h5>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
-</form>
\ No newline at end of file
+    </form>
\ No newline at end of file
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
index ecc9f995c..66919ed56 100644
--- 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
@@ -1,41 +1,44 @@
-<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 d-flex align-items-center" data-toggle="collapse" data-target="#price"
-                    aria-expanded="true" aria-controls="price">
-                <img src="{{ img('visiosoft.module.advs::images/price-icon.svg').url }}" alt="price icon" class="mr-2">
-                <span>{{ trans("visiosoft.module.advs::field.price.name") }}</span>
-            </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') }}">
+{% if setting_value('visiosoft.module.advs::hide_price_filter') == false %}
+    <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 d-flex align-items-center" data-toggle="collapse"
+                        data-target="#price"
+                        aria-expanded="true" aria-controls="price">
+                    <img src="{{ img('visiosoft.module.advs::images/price-icon.svg').url }}" alt="price icon"
+                         class="mr-2">
+                    <span>{{ trans("visiosoft.module.advs::field.price.name") }}</span>
+                </button>
+            </h5>
+        </div>
+        <div id="price" class="collapse show overflow-auto" aria-labelledby="priceHeading"
+             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 {{ app.request.get('currency') == currency ? 'selected' }} value="{{ currency }}">
+                                {{ currency_symbol(currency) }}
+                            </option>
+                        {% endfor %}
+                    </select>
+                </div>
 
             </div>
-            <div class="col-md-4 py-1 px-0">
-                <select name="currency" id="currency" class="form-control">
-                    {% for currency in active_currencies %}
-                        <option {{ app.request.get('currency') == currency ? 'selected' }} value="{{ currency }}">
-                            {{ currency_symbol(currency) }}
-                        </option>
-                    {% endfor %}
-                </select>
-            </div>
-
         </div>
     </div>
-</div>
\ No newline at end of file
+{% endif %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
index 7f1debffe..81d0a953b 100644
--- a/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/ads-list/partials/list-filter.twig
@@ -8,8 +8,7 @@
             </button>
         </h5>
     </div>
-    <div id="category" class="collapse show overflow-auto" aria-labelledby="categoryHeading"
-         data-parent="#filter" style="max-height: 300px;">
+    <div id="category" class="collapse show overflow-auto" aria-labelledby="categoryHeading" style="max-height: 300px;">
         <div class="list-group">
             {% for maincat in params.mainCats %}
                 {% set name = maincat['val'] %}
diff --git a/addons/default/visiosoft/location-module/resources/config/settings/sections.php b/addons/default/visiosoft/location-module/resources/config/settings/sections.php
index 19415e02c..dc87cbf02 100644
--- a/addons/default/visiosoft/location-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/location-module/resources/config/settings/sections.php
@@ -22,6 +22,12 @@ return [
                     'google_map_key', 'map_coordinates_long', 'map_coordinates_lat'
                 ],
             ],
+            'filter' => [
+                'title' => 'visiosoft.module.location::section.filter',
+                'fields' => [
+                    'hide_location_filter'
+                ],
+            ],
             'html' => [
                 'html' => '{% include "visiosoft.module.location::settings/field" %}',
             ],
diff --git a/addons/default/visiosoft/location-module/resources/config/settings/settings.php b/addons/default/visiosoft/location-module/resources/config/settings/settings.php
index 25e8b0561..5a75e3123 100644
--- a/addons/default/visiosoft/location-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/location-module/resources/config/settings/settings.php
@@ -68,4 +68,11 @@ return [
             'default_value' => '40.97817786299617',
         ],
     ],
+
+    'hide_location_filter' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+        ],
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/location-module/resources/lang/en/section.php b/addons/default/visiosoft/location-module/resources/lang/en/section.php
index ced3f6e9e..dd4fec49a 100644
--- a/addons/default/visiosoft/location-module/resources/lang/en/section.php
+++ b/addons/default/visiosoft/location-module/resources/lang/en/section.php
@@ -19,4 +19,5 @@ return [
     'general' => 'General',
     'map' => 'Map',
     'setting' => 'Setting',
+    'filter' => 'Filter',
 ];
diff --git a/addons/default/visiosoft/location-module/resources/lang/en/setting.php b/addons/default/visiosoft/location-module/resources/lang/en/setting.php
index 2bb096a0e..05cfd8e38 100644
--- a/addons/default/visiosoft/location-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/location-module/resources/lang/en/setting.php
@@ -40,4 +40,8 @@ return [
     'map_coordinates_lat' => [
         'name' => 'Default Lat',
     ],
+
+    'hide_location_filter' => [
+        'name' => 'Hide Location Filter',
+    ],
 ];
diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig
index 02f7b51ff..13fa936b5 100644
--- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig
+++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig
@@ -1,23 +1,24 @@
-{% if setting_value('visiosoft.module.location::list_page_location') %}
-    <div class="card mb-3">
-        <div class="card-header breadcrumb mb-0" id="locationHeading">
-            <h5 class="mb-0">
-                <button class="btn btn-link text-dark d-flex align-items-center" data-toggle="collapse"
-                        data-target="#location" aria-expanded="true" aria-controls="location">
-                    <img src="{{ img('visiosoft.module.location::images/location-icon.svg').url }}" class="mr-2"
-                         alt="location icon">
-                    <span>{{ trans("visiosoft.module.location::addon.title") }}</span>
-                </button>
-            </h5>
+{% if setting_value('visiosoft.module.location::hide_location_filter') == false %}
+    {% if setting_value('visiosoft.module.location::list_page_location') %}
+        <div class="card mb-3">
+            <div class="card-header breadcrumb mb-0" id="locationHeading">
+                <h5 class="mb-0">
+                    <button class="btn btn-link text-dark d-flex align-items-center" data-toggle="collapse"
+                            data-target="#location" aria-expanded="true" aria-controls="location">
+                        <img src="{{ img('visiosoft.module.location::images/location-icon.svg').url }}" class="mr-2"
+                             alt="location icon">
+                        <span>{{ trans("visiosoft.module.location::addon.title") }}</span>
+                    </button>
+                </h5>
+            </div>
+            <div id="location" class="collapse show overflow-auto" aria-labelledby="locationHeading">
+                {% include "visiosoft.module.location::ads-list/partials/location-fields" %}
+            </div>
         </div>
-        <div id="location" class="collapse show overflow-auto" aria-labelledby="locationHeading"
-             data-parent="#filter">
-            {% include "visiosoft.module.location::ads-list/partials/location-fields" %}
-        </div>
-    </div>
-    <script>
-        var select_trans = "{{ trans('visiosoft.module.location::field.pick_option.name') }}";
-    </script>
-    {{ asset_add("scripts.js", "visiosoft.module.location::js/filterLocation.js") }}
-    {{ asset_add("styles.css", "visiosoft.module.location::css/filterLocation.css") }}
+        <script>
+            var select_trans = "{{ trans('visiosoft.module.location::field.pick_option.name') }}";
+        </script>
+        {{ asset_add("scripts.js", "visiosoft.module.location::js/filterLocation.js") }}
+        {{ asset_add("styles.css", "visiosoft.module.location::css/filterLocation.css") }}
+    {% endif %}
 {% endif %}
\ No newline at end of file

From 685e258be8d2c097cdcecce29fdbf25b0220d387 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 18 Aug 2020 15:34:07 +0300
Subject: [PATCH 5/8] fixed messy

---
 .../src/Adv/Command/appendRequestURL.php      | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php
index 0c1d7eb93..8b85930e4 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Command/appendRequestURL.php
@@ -32,24 +32,21 @@ class appendRequestURL
     {
 
         $request = $this->removeParameters($this->request);
+        $count_newParameters = count($this->new_parameters);
+        $count_request = count($this->request);
 
-        if (count($this->new_parameters) === 0 && count($request) === 0) {
-            return $this->url;
-        } elseif (count($this->new_parameters) > 0 && count($request) > 0) {
-            return $this->url
-                . (Str::contains($this->url, '?') ? '&' : '?')
-                . Arr::query($this->appends(array_merge($request, $this->new_parameters)));
-        } elseif (count($this->new_parameters) > 0 && count($request) === 0) {
-            return $this->url
-                . (Str::contains($this->url, '?') ? '&' : '?')
-                . Arr::query($this->appends($this->new_parameters));
-        } elseif (count($this->new_parameters) === 0 && count($request) > 0) {
-            return $this->url
-                . (Str::contains($this->url, '?') ? '&' : '?')
-                . Arr::query($this->appends($request));
+        if ($count_newParameters > 0) {
+            return ($count_request > 0) ? $this->createURL(array_merge($request, $this->new_parameters)) : $this->createURL($this->new_parameters);
+        } else {
+            return ($count_request > 0) ? $this->createURL($request) : $this->url;
         }
     }
 
+    public function createURL($append)
+    {
+        return $this->url . (Str::contains($this->url, '?') ? '&' : '?') . Arr::query($this->appends($append));
+    }
+
     /**
      * @param $key
      * @param null $value

From 597f53a788aad98166e2ed5b71888d876ba5d541 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 18 Aug 2020 17:43:14 +0300
Subject: [PATCH 6/8] add booking layouts

---
 .../resources/views/layouts/booking.twig       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig

diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig
new file mode 100644
index 000000000..04b3fefe9
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="{{ config('app.locale') }}">
+
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    {% block styles %}{% endblock %}
+</head>
+<body>
+<div class="container" style="max-width: 800px;">
+
+    {% include "theme::partials/messages" %}
+
+    {% block content %}
+    {% endblock %}
+</div>
+
+</body>
+</html>

From 01f5737761b892413df29625ed1895dba0568d28 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 20 Aug 2020 09:29:57 +0300
Subject: [PATCH 7/8] add page layouts

---
 .../resources/views/layouts/page.twig         | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 addons/default/visiosoft/base-theme/resources/views/layouts/page.twig

diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig
new file mode 100644
index 000000000..7ac84f568
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig
@@ -0,0 +1,37 @@
+<!doctype html>
+
+<!--[if lt IE 7]>
+<html class="nojs ms lt_ie7" lang="en"><![endif]-->
+<!--[if IE 7]>
+<html class="nojs ms ie7" lang="en"><![endif]-->
+<!--[if IE 8]>
+<html class="nojs ms ie8" lang="en"><![endif]-->
+<!--[if gt IE 8]>
+<html class="nojs ms" lang="en"><![endif]-->
+
+<html>
+
+<head>
+    {% include "visiosoft.theme.base::partials/metadata" %}
+    {% block styles %}{% endblock %}
+</head>
+
+<body>
+
+{% include "visiosoft.theme.base::partials/header" %}
+
+<main id="main">
+    <div class="container">
+
+        {% include "visiosoft.theme.base::partials/messages" %}
+
+        {% block content %}{% endblock %}
+
+    </div>
+</main>
+
+{% include "visiosoft.theme.base::partials/footer" %}
+{% include "visiosoft.theme.base::partials/settings" %}
+
+</body>
+</html>
\ No newline at end of file

From b22ecb1d60b6d497c6d3372d318b1273634111b9 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 20 Aug 2020 13:16:02 +0300
Subject: [PATCH 8/8] fixed redirect problem

---
 .../src/Http/Middleware/redirectDiffrentLang.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php b/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php
index dd71ae2ca..6475f893f 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php
@@ -35,14 +35,20 @@ class redirectDiffrentLang
         $setting_language = setting_value('streams::default_locale');
         $current_language = $request->session()->get('_locale', $setting_language);
         $request_url = ltrim($request->getRequestUri(), '/');
+
+        // If the segment(1) is admin and language parameters is not null, no forwarding will be made.
+        if ($request->segment(1) == "admin" and in_array($current_language, explode('/', $original_url))) {
+            return $this->redirect->to($request->fullUrl());
+        }
+
         if ($current_language != $setting_language) {
-            if ($request_url != "" and $original_url != '/' . $current_language . '/' . $request_url) {
+
+            // If the method is get, no forwarding will be made.
+            // If the segment(1) is admin, no forwarding will be made.
+
+            if ($request->method() == "GET" and $request->segment(1) != "admin" and $request_url != "" and $original_url != '/' . $current_language . '/' . $request_url) {
                 return $this->redirect->to('/' . $current_language . '/' . $request_url);
             }
-        } else {
-            if ($request_url == "" and '/' . $current_language != $original_url) {
-                $this->redirect->to($current_language);
-            }
         }
 
         return $next($request);