- {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
-
-
-
-
-
+{% if setting_value('visiosoft.module.advs::hide_price_filter') == false %}
+
+
+
+
+ {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
\ No newline at end of file
+{% endif %}
\ No newline at end of file
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..8b85930e4 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,23 +30,23 @@ class appendRequestURL
*/
public function handle()
{
- if (count($this->new_parameters) === 0 && count($this->request) === 0) {
- return $this->url;
- } elseif (count($this->new_parameters) > 0 && count($this->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) {
- return $this->url
- . (Str::contains($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));
+
+ $request = $this->removeParameters($this->request);
+ $count_newParameters = count($this->new_parameters);
+ $count_request = count($this->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
@@ -87,4 +89,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/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 @@
+
+
+
+
+
+ {% block styles %}{% endblock %}
+
+
+
+
+ {% include "theme::partials/messages" %}
+
+ {% block content %}
+ {% endblock %}
+
+
+
+
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..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 @@