fix typo

# Conflicts:
#	CHANGELOG.md
#	metadata.php

Application/Controller/Admin/ManufacturerInfoLongdesc.php

@@ -103,7 +103,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
      */
     public function d3GetLongdescParamValue(): string
     {
-        return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
+        return (string) Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
     }
 
     /**

CHANGELOG.md

@@ -4,7 +4,27 @@ All notable changes to this project will be documented in this file.
 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.1.3.0...rel_1.1.x)
+## [unreleased](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.4.2...rel_1.1.x)
+
+## [1.1.4.2](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.4.0...1.1.4.1) - 2025-06-23
+### Added
+- support for OX 6.5.5 
+
+## [1.1.4.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.4.0...1.1.4.1) - 2024-12-12
+### Fixed
+- fix wrong admin menu section
+
+## [1.1.4.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.3.1...1.1.4.0) - 2024-12-05
+
+### Added
+- longdesc will parsed by Smarty
+
+## [1.1.3.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.3.0...1.1.3.1) - 2024-11-26
+### Fixed
+- rename language files
+
+### Changed
+- switch to open source
 
 ## [1.1.3.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.2.1...1.1.3.0) - 2024-11-22
 ### Fixed

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -47,7 +47,7 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
      */
     public function d3GetLongdesc(): Field
     {
-        $longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+        $longName = $this->_getFieldLongName(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
-        return $this->$longName;
+        return $this->$longName ?: oxNew(Field::class);
     }
 }

Modules/Application/Model/ManufacturerInfoList.php

@@ -34,12 +34,22 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent
         parent::_addCategoryFields($oManufacturer);
 
         if (Registry::getConfig()->getConfigParam('d3manufacturerinformation_showManufacturertextOnManufacturerPage')) {
-            $oManufacturer->oxcategories__oxlongdesc = new Field(
+            /** @var \OxidEsales\Eshop\Core\UtilsView $oUtilsView */
-                html_entity_decode(
+            $oUtilsView = Registry::getUtilsView();
-                    $oManufacturer->getFieldData( Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME ) ?? ''
+
-                ),
+            $longdesc = $oManufacturer->d3GetLongdesc()->getRawValue() ?? '';
-                Field::T_RAW
+            $deactivateSmarty = Registry::getConfig()->getConfigParam('deactivateSmartyForCmsContent');
-            );
+            $processLongDescriptions = Registry::getConfig()->getConfigParam('bl_perfParseLongDescinSmarty');
+            if (!$deactivateSmarty && $processLongDescriptions) {
+                $longdesc = $oUtilsView->parseThroughSmarty(
+                    $longdesc,
+                    $oManufacturer->getId() . $oManufacturer->getLanguage(),
+                    null,
+                    true
+                ) ?? '';
+            }
+
+            $oManufacturer->oxcategories__oxlongdesc = new Field(html_entity_decode($longdesc), Field::T_RAW);
         }
     }
 }

README.md

@@ -2,7 +2,10 @@
 
 # ![D3 Logo](https://logos.oxidmodule.com/d3logo_24x24.svg) Herstellerinformationen für OXID eShop
 
-Fügt die Möglichkeit zur Langtextbeschreibung den Hersteller hinzu
+Fügt die Möglichkeit zur Langtextbeschreibung den Herstellern hinzu. Die Anzeige der Informationen erfolgt einstellbar auf der Herstellerübersicht und/oder als Infotab an den Artikeln der Herstellers.
+
+**Diese Software wird unter einer kommerziellen Lizenz vertrieben.**
+Kontaktieren Sie uns für eine Nutzungslizenz vor der Installation.
 
 ## Inhaltsverzeichnis
 
@@ -16,6 +19,7 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 Öffnen Sie eine Kommandozeile und navigieren Sie zum Stammverzeichnis des Shops (Elternverzeichnis von source und vendor). Führen Sie die folgenden Befehle aus. Passen Sie die Pfadangaben an Ihre Installationsumgebung an.
 
 ```bash
+composer config repositories.d3manufacturerinformation vcs https://git.d3data.de/D3Public/manufacturer-information.git
 composer require d3/manufacturerinformation:"~1.1.0"
 ```
 

composer.json

@@ -25,7 +25,7 @@
   ],
   "require": {
     "php": "~7.1 || ~8.0",
-    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.3"
+    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.4"
   },
   "require-dev": {
     "oxid-esales/oxideshop-ce": "~6.14.0",

menu.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-15"?>
 <OX>
     <OXMENU id="NAVIGATION_ESHOPADMIN">
-        <MAINMENU id="mxuadmin">
+        <MAINMENU id="mxmainmenu">
             <SUBMENU id="mxmanufacturer" cl="manufacturer" list="manufacturer_list">
                 <TAB id="mxd3manufacturerinfolongdesc" cl="d3manufacturerinfolongdesc" />
             </SUBMENU>

metadata.php

@@ -38,7 +38,7 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'picture.svg',
-    'version'     => '1.1.3.0',
+    'version'     => '1.1.4.2',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',

migration/data/Version20241023154223.php

@@ -28,7 +28,7 @@ final class Version20241023154223 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return 'Adds the D3 manufacturer longdesc column';
+        return 'Add the D3 manufacturer longdesc column';
     }
 
     public function up(Schema $schema): void

migration/data/Version20241028172608.php

@@ -28,7 +28,7 @@ final class Version20241028172608 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return 'Adds multilang tables for the D3 manufacturer longdesc';
+        return 'Add multilang tables for the D3 manufacturer longdesc';
     }
 
     public function up(Schema $schema): void