diff --git a/composer.lock b/composer.lock
index b6ecad76..f1408b8f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -373,20 +373,20 @@
},
{
"name": "doctrine/event-manager",
- "version": "1.1.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/event-manager.git",
- "reference": "629572819973f13486371cb611386eb17851e85c"
+ "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/event-manager/zipball/629572819973f13486371cb611386eb17851e85c",
- "reference": "629572819973f13486371cb611386eb17851e85c",
+ "url": "https://api.github.com/repos/doctrine/event-manager/zipball/41370af6a30faa9dc0368c4a6814d596e81aba7f",
+ "reference": "41370af6a30faa9dc0368c4a6814d596e81aba7f",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
"conflict": {
"doctrine/common": "<2.9@dev"
@@ -445,7 +445,21 @@
"event system",
"events"
],
- "time": "2019-11-10T09:48:07+00:00"
+ "funding": [
+ {
+ "url": "https://www.doctrine-project.org/sponsorship.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.patreon.com/phpdoctrine",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-05-29T18:28:51+00:00"
},
{
"name": "doctrine/instantiator",
@@ -3161,7 +3175,7 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -3237,7 +3251,7 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -3315,7 +3329,7 @@
},
{
"name": "symfony/polyfill-intl-icu",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-icu.git",
@@ -3391,16 +3405,16 @@
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
+ "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
- "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+ "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
"shasum": ""
},
"require": {
@@ -3472,11 +3486,11 @@
"type": "tidelift"
}
],
- "time": "2020-07-14T12:35:20+00:00"
+ "time": "2020-08-04T06:02:08+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -3557,7 +3571,7 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -3634,7 +3648,7 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
@@ -3711,7 +3725,7 @@
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
@@ -3784,7 +3798,7 @@
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@@ -3860,7 +3874,7 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.18.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
diff --git a/public/typo3conf/ext/ep_products/Classes/Controller/RegionController.php b/public/typo3conf/ext/ep_products/Classes/Controller/RegionController.php
index 55b8940d..0b4e9a79 100644
--- a/public/typo3conf/ext/ep_products/Classes/Controller/RegionController.php
+++ b/public/typo3conf/ext/ep_products/Classes/Controller/RegionController.php
@@ -67,8 +67,13 @@ class RegionController extends ActionController
$regionUid = $this->settings['regionUid'];
$region = $this->regionRepository->findByIdentifier($regionUid);
}
+ $additionalRegionUids = GeneralUtility::trimExplode(',', $this->settings['additionalRegionUids'], true);
+ $additionalRegionUids = array_map(function ($uid) {
+ return (int)$uid;
+ }, $additionalRegionUids);
+ $teaserRegionUids = array_merge([$region->getUid()], $additionalRegionUids);
$filterSettings = new FilterSettings();
- $filterSettings->setRegionUids([$region->getUid()]);
+ $filterSettings->setRegionUids($teaserRegionUids);
$excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true);
$limit = $this->settings['showMoreLink'] ? 4 : 0;
$teasers = $this->productDataService->getTeasergroup($filterSettings, $excludedConceptUids, $limit);
diff --git a/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_region_detail.xml b/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_region_detail.xml
index 2e313c07..0c8fae8d 100644
--- a/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_region_detail.xml
+++ b/public/typo3conf/ext/ep_products/Configuration/FlexForms/flexform_region_detail.xml
@@ -24,6 +24,20 @@
+
+
+ 0
+
+
+ select
+ selectMultipleSideBySide
+ tx_epproducts_domain_model_region
+ AND tx_epproducts_domain_model_region.hidden = 0 AND tx_epproducts_domain_model_region.deleted = 0 ORDER BY tx_epproducts_domain_model_region.name
+ 0
+ 5
+
+
+
0