From 9110687cef0c51416e5987de41a8955e773ed080 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Thu, 21 Nov 2024 17:01:14 +0100 Subject: [PATCH] make displaying manufacturer information on manufacturer list page configurable --- .../views/admin/de/d3manufacturerinformation_lang.php | 1 + .../views/admin/en/d3manufacturerinformation_lang.php | 3 ++- CHANGELOG.md | 5 +++++ Modules/Application/Model/ManufacturerInfoList.php | 10 +++++++++- metadata.php | 6 ++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Application/views/admin/de/d3manufacturerinformation_lang.php b/Application/views/admin/de/d3manufacturerinformation_lang.php index e4e5a6b..15ce7e0 100644 --- a/Application/views/admin/de/d3manufacturerinformation_lang.php +++ b/Application/views/admin/de/d3manufacturerinformation_lang.php @@ -23,4 +23,5 @@ $aLang = [ 'mxd3manufacturerinfolongdesc' => 'Langtext', 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen', 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'Herstellertexte auf Herstellerseite anzeigen', ]; diff --git a/Application/views/admin/en/d3manufacturerinformation_lang.php b/Application/views/admin/en/d3manufacturerinformation_lang.php index 834195b..f898b05 100644 --- a/Application/views/admin/en/d3manufacturerinformation_lang.php +++ b/Application/views/admin/en/d3manufacturerinformation_lang.php @@ -22,5 +22,6 @@ $aLang = [ 'mxd3manufacturerinfolongdesc' => 'Text', 'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings', - 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'display existing manufacturer texts on item details as a tab', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'show existing manufacturer texts on item details page as a tab', + 'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnManufacturerPage' => 'show manufacturer texts on manufacturer page', ]; diff --git a/CHANGELOG.md b/CHANGELOG.md index f3fb875..0a8aa31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [unreleased](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.2.1...rel_1.x) +### Fixed +- content encoding on manufacturers list page + +### Added +- displaying content on manufacturers list page configurable ## [1.0.2.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.2.0...1.0.2.1) - 2024-11-21 ### Fixed diff --git a/Modules/Application/Model/ManufacturerInfoList.php b/Modules/Application/Model/ManufacturerInfoList.php index 35ae19d..21a8ad3 100644 --- a/Modules/Application/Model/ManufacturerInfoList.php +++ b/Modules/Application/Model/ManufacturerInfoList.php @@ -21,6 +21,7 @@ use D3\ManufacturerInformation\Application\Model\Constants; use OxidEsales\Eshop\Application\Model\Manufacturer; use OxidEsales\Eshop\Application\Model\ManufacturerList; use OxidEsales\Eshop\Core\Field; +use OxidEsales\Eshop\Core\Registry; class ManufacturerInfoList extends ManufacturerInfoList_parent { @@ -32,6 +33,13 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent { parent::_addCategoryFields($oManufacturer); - $oManufacturer->oxcategories__oxlongdesc = new Field($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME), Field::T_RAW); + if (Registry::getConfig()->getConfigParam('d3manufacturerinformation_showManufacturertextOnManufacturerPage')) { + $oManufacturer->oxcategories__oxlongdesc = new Field( + html_entity_decode( + $oManufacturer->getFieldData( Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME ) ?? '' + ), + Field::T_RAW + ); + } } } diff --git a/metadata.php b/metadata.php index 21e6093..1b5b306 100644 --- a/metadata.php +++ b/metadata.php @@ -64,6 +64,12 @@ $aModule = [ 'type' => 'bool', 'value' => true, ], + [ + 'group' => $sModuleId.'_main', + 'name' => $sModuleId.'_showManufacturertextOnManufacturerPage', + 'type' => 'bool', + 'value' => true, + ], ], 'blocks' => [ [