Merge pull request #641 from openclassify/vedatakd

remove page params for change category

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'
+                ],
+            ],
         ],
     ],
 ];

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,
+        ]
+    ],
 ];

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',
     ],

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',
+    ],
 ];

addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig

@@ -48,19 +48,23 @@
                         {% include 'visiosoft.module.advs::list/partials/price-filter' %}
                         <!-- Price Filter End -->
 
+                        {% 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="#date"
+                                        <button class="btn btn-link text-dark d-flex align-items-center"
-                                        aria-expanded="true" aria-controls="date">
+                                                data-toggle="collapse" data-target="#dateContainer"
-                                    <img src="{{ img('visiosoft.module.advs::images/date-icon.svg').url }}" class="mr-2"
+                                                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 id="dateContainer" class="collapse show overflow-auto" aria-labelledby="dateHeading"
+                                <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">
@@ -100,20 +104,24 @@
                                 </div>
                             </div>
                             <!-- Date Filter End -->
+                        {% endif %}
 
+                        {% 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="#media"
+                                        <button class="btn btn-link text-dark" data-toggle="collapse"
-                                        aria-expanded="true" aria-controls="media">
+                                                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 id="mediaContainer" class="collapse show overflow-auto" aria-labelledby="mediaHeading"
+                                <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">
@@ -142,14 +150,16 @@
                                 </div>
                             </div>
                             <!-- Media Filter End -->
+                        {% endif %}
 
+                        {% 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="#mapFilter"
+                                                data-target="#mapContainer"
-                                        aria-expanded="true" aria-controls="mapFilter">
+                                                aria-expanded="true" aria-controls="mapContainer">
                                             <i class="fa fa-map"></i>
                                             {{ trans("visiosoft.module.advs::field.map.name") }}
                                         </button>
@@ -173,6 +183,7 @@
                                 </div>
                             </div>
                             <!-- Map Filter End -->
+                        {% endif %}
 
                         <div class="card">
                             <div class="card-header bg-primary text-center" id="submitHeading">

addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig

@@ -1,15 +1,17 @@
+{% 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"
+                <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">
+                    <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') %}
@@ -39,3 +41,4 @@
             </div>
         </div>
     </div>
+{% endif %}

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,23 +30,23 @@ class appendRequestURL
      */
     public function handle()
     {
-        if (count($this->new_parameters) === 0 && count($this->request) === 0) {
+
-            return $this->url;
+        $request = $this->removeParameters($this->request);
-        } elseif (count($this->new_parameters) > 0 && count($this->request) > 0) {
+        $count_newParameters = count($this->new_parameters);
-            return $this->url
+        $count_request = count($this->request);
-                . (Str::contains($this->url, '?') ? '&' : '?')
+
-                . Arr::query($this->appends(array_merge($this->request, $this->new_parameters)));
+        if ($count_newParameters > 0) {
-        } elseif (count($this->new_parameters) > 0 && count($this->request) === 0) {
+            return ($count_request > 0) ? $this->createURL(array_merge($request, $this->new_parameters)) : $this->createURL($this->new_parameters);
-            return $this->url
+        } else {
-                . (Str::contains($this->url, '?') ? '&' : '?')
+            return ($count_request > 0) ? $this->createURL($request) : $this->url;
-                . Arr::query($this->appends($this->new_parameters));
-        } elseif (count($this->new_parameters) === 0 && count($this->request) > 0) {
-            return $this->url
-                . (Str::contains($this->url, '?') ? '&' : '?')
-                . Arr::query($this->appends($this->request));
         }
     }
 
+    public function createURL($append)
+    {
+        return $this->url . (Str::contains($this->url, '?') ? '&' : '?') . Arr::query($this->appends($append));
+    }
+
     /**
      * @param $key
      * @param null $value
@@ -87,4 +89,13 @@ class appendRequestURL
 
         return $this;
     }
+
+    public function removeParameters(array $array)
+    {
+        foreach ($this->remove_parameters as $parameter) {
+            unset($array[$parameter]);
+        }
+
+        return $array;
+    }
 }

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(

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>

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"
+    <div id="category" class="collapse show overflow-auto" aria-labelledby="categoryHeading" style="max-height: 300px;">
-         data-parent="#filter" style="max-height: 300px;">
         <div class="list-group">
             {% for maincat in params.mainCats %}
                 {% set name = maincat['val'] %}
@@ -29,9 +28,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 +40,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>

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" %}',
             ],

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,
+        ],
+    ],
 ];

addons/default/visiosoft/location-module/resources/lang/en/section.php

@@ -19,4 +19,5 @@ return [
     'general' => 'General',
     'map' => 'Map',
     'setting' => 'Setting',
+    'filter' => 'Filter',
 ];

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',
+    ],
 ];

addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig

@@ -1,3 +1,4 @@
+{% 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">
@@ -10,8 +11,7 @@
                     </button>
                 </h5>
             </div>
-        <div id="location" class="collapse show overflow-auto" aria-labelledby="locationHeading"
+            <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>
@@ -21,3 +21,4 @@
         {{ asset_add("scripts.js", "visiosoft.module.location::js/filterLocation.js") }}
         {{ asset_add("styles.css", "visiosoft.module.location::css/filterLocation.css") }}
     {% endif %}
+{% endif %}