From 26cf0b333f252464cb55b718e3cbff6b3d539b25 Mon Sep 17 00:00:00 2001 From: Steve Tentrop Date: Mon, 18 Nov 2024 12:17:33 +0100 Subject: [PATCH 1/3] add flag to search factory --- src/Controllers/ItemController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Controllers/ItemController.php b/src/Controllers/ItemController.php index 5bf277abc..d782a8e22 100644 --- a/src/Controllers/ItemController.php +++ b/src/Controllers/ItemController.php @@ -44,10 +44,14 @@ public function showItem( int $variationId = 0, $category = null ) { + /** @var TemplateConfigService $templateConfigService */ + $templateConfigService = pluginApp(TemplateConfigService::class); + $itemSearchOptions = [ 'itemId' => $itemId, 'variationId' => $variationId, - 'setCategory' => is_null($category) + 'setCategory' => is_null($category), + 'manufacturerFields' => $templateConfigService->get('item.manufacturer_fields', 'all'), ]; $this->plentyId = Utils::getPlentyId(); @@ -57,8 +61,6 @@ public function showItem( 'variationAttributeMap' => VariationAttributeMap::getSearchFactory($itemSearchOptions) ]; - /** @var TemplateConfigService $templateConfigService */ - $templateConfigService = pluginApp(TemplateConfigService::class); if ($variationId > 0 && $templateConfigService->getInteger('item.show_please_select') == 1) { unset($itemSearchOptions['variationId']); From a8f3378370b78c0de9b82c37c6e7320135c090e8 Mon Sep 17 00:00:00 2001 From: Steve Tentrop Date: Mon, 25 Nov 2024 10:55:29 +0100 Subject: [PATCH 2/3] rename config key --- src/Controllers/ItemController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/ItemController.php b/src/Controllers/ItemController.php index d782a8e22..d360947d0 100644 --- a/src/Controllers/ItemController.php +++ b/src/Controllers/ItemController.php @@ -51,7 +51,7 @@ public function showItem( 'itemId' => $itemId, 'variationId' => $variationId, 'setCategory' => is_null($category), - 'manufacturerFields' => $templateConfigService->get('item.manufacturer_fields', 'all'), + 'manufacturerFields' => $templateConfigService->get('item.manufacturer_data', 'all'), ]; $this->plentyId = Utils::getPlentyId(); From 1af19236251c3f21a3a369cc9cc53cef76b55e10 Mon Sep 17 00:00:00 2001 From: Steve Tentrop Date: Wed, 27 Nov 2024 20:03:28 +0100 Subject: [PATCH 3/3] added changelog and increase version --- meta/documents/changelog_de.md | 6 ++++++ meta/documents/changelog_en.md | 6 ++++++ plugin.json | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/meta/documents/changelog_de.md b/meta/documents/changelog_de.md index 7c6c21d49..6e750be01 100644 --- a/meta/documents/changelog_de.md +++ b/meta/documents/changelog_de.md @@ -1,5 +1,11 @@ # Release Notes für IO +## v5.0.70 (2024-11-28) Übersicht aller Änderungen + +### Hinzugefügt + +- Eine Möglichkeit zur Filterung der Herstellerdaten wurde hinzugefügt. + ## v5.0.68 (2024-09-26) Übersicht aller Änderungen ### Behoben diff --git a/meta/documents/changelog_en.md b/meta/documents/changelog_en.md index adc1e5bdc..387d63de3 100644 --- a/meta/documents/changelog_en.md +++ b/meta/documents/changelog_en.md @@ -1,5 +1,11 @@ # Release Notes for IO +## v5.0.70 (2024-11-28) Overview of all changes + +### Added + +- A possibility to filter manufacturer data has been added. + ## v5.0.68 (2024-09-26) Overview of all changes ### Fixed diff --git a/plugin.json b/plugin.json index 6b79a97d2..1443046c8 100644 --- a/plugin.json +++ b/plugin.json @@ -1,5 +1,5 @@ { - "version" : "5.0.68", + "version" : "5.0.70", "name" : "IO", "marketplaceName" : {"de": "IO","en": "IO"}, "license" : "AGPL-3.0",