From 5eec6c16252d35ddad332f49830cd833cb39344f Mon Sep 17 00:00:00 2001 From: Bram Pauwelyn Date: Mon, 8 Jan 2024 15:06:20 +0100 Subject: [PATCH 1/5] WID-488 - Align widget vlieg query with uiv vlieg query --- src/Widget/WidgetType/Facets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widget/WidgetType/Facets.php b/src/Widget/WidgetType/Facets.php index 3581f8b6..5e1b4c54 100644 --- a/src/Widget/WidgetType/Facets.php +++ b/src/Widget/WidgetType/Facets.php @@ -42,7 +42,7 @@ * }, * { * "label": "Voor kinderen", - * "query": "(typicalAgeRange:[0 TO 12] OR labels:""ook voor kinderen"") AND NOT typicalAgeRange:[13 TO *]" + * "query": "(typicalAgeRange:[* TO 11] AND allAges:false) OR labels:"ook voor kinderen")" * }, * { * "label": "Gratis activiteiten", From 7630d711920dff71dc32fd935f6d0c3923aa935e Mon Sep 17 00:00:00 2001 From: Bram Pauwelyn Date: Tue, 9 Jan 2024 16:13:44 +0100 Subject: [PATCH 2/5] WID-524 - Replace museumpass logo --- views/widgets/event-summary.html.twig | 12 +++++++++++- .../search-results-widget/detail-page.html.twig | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/views/widgets/event-summary.html.twig b/views/widgets/event-summary.html.twig index 5bd60af2..0ce9841f 100644 --- a/views/widgets/event-summary.html.twig +++ b/views/widgets/event-summary.html.twig @@ -39,7 +39,17 @@ {% endif %} {% if settings_items.icon_museumpass.enabled and event.museumpas %} - + + + + + + + + + + + {% endif %} {% if settings_items.icon_uitpas.enabled and event.uitpas %} diff --git a/views/widgets/search-results-widget/detail-page.html.twig b/views/widgets/search-results-widget/detail-page.html.twig index 5f959253..97e218b6 100644 --- a/views/widgets/search-results-widget/detail-page.html.twig +++ b/views/widgets/search-results-widget/detail-page.html.twig @@ -25,7 +25,7 @@ {% endif %} {% if settings.icon_museumpass.enabled and event.museumpas %} - + {% endif %} {% if settings.icon_uitpas.enabled and event.uitpas %} From 70a47033f635edb85f84d235bd81d8c9a58f6369 Mon Sep 17 00:00:00 2001 From: Bram Pauwelyn Date: Wed, 10 Jan 2024 15:40:13 +0100 Subject: [PATCH 3/5] WID-524 - Fix indentation --- views/widgets/event-summary.html.twig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/views/widgets/event-summary.html.twig b/views/widgets/event-summary.html.twig index 0ce9841f..fb8e90d4 100644 --- a/views/widgets/event-summary.html.twig +++ b/views/widgets/event-summary.html.twig @@ -39,17 +39,17 @@ {% endif %} {% if settings_items.icon_museumpass.enabled and event.museumpas %} - - - - - - - - - - - + + + + + + + + + + + {% endif %} {% if settings_items.icon_uitpas.enabled and event.uitpas %} From 216337019ef473943bac6bca0cc76b20a302a79f Mon Sep 17 00:00:00 2001 From: Bram Pauwelyn Date: Wed, 10 Jan 2024 16:37:08 +0100 Subject: [PATCH 4/5] WID-488 - Fix children query --- src/Widget/WidgetType/Facets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widget/WidgetType/Facets.php b/src/Widget/WidgetType/Facets.php index 5e1b4c54..6ee86cf3 100644 --- a/src/Widget/WidgetType/Facets.php +++ b/src/Widget/WidgetType/Facets.php @@ -42,7 +42,7 @@ * }, * { * "label": "Voor kinderen", - * "query": "(typicalAgeRange:[* TO 11] AND allAges:false) OR labels:"ook voor kinderen")" + * "query": "(typicalAgeRange:[* TO 11] AND allAges:false) OR labels:ook voor kinderen" * }, * { * "label": "Gratis activiteiten", From d0ffa2c57dd6ce3e1b9a74b40c3b9df03df083eb Mon Sep 17 00:00:00 2001 From: Bram Pauwelyn Date: Wed, 10 Jan 2024 16:37:20 +0100 Subject: [PATCH 5/5] Fix deprecation warning --- src/Widget/WidgetType/Facets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widget/WidgetType/Facets.php b/src/Widget/WidgetType/Facets.php index 6ee86cf3..0911e523 100644 --- a/src/Widget/WidgetType/Facets.php +++ b/src/Widget/WidgetType/Facets.php @@ -357,7 +357,7 @@ private function buildQuery(SearchQueryInterface $searchQuery, SearchResultsQuer // Add advanced query string to API request. if (!empty($advancedQuery)) { $searchQuery->addParameter( - new Query(implode($advancedQuery, ' AND ')) + new Query(implode(' AND ', $advancedQuery)) ); if ($searchResultsQueryAlter) {