adjust version information

# Conflicts:
#	CHANGELOG.md

Application/Controller/Admin/ManufacturerInfoLongdesc.php

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

CHANGELOG.md

@@ -4,60 +4,32 @@ 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.4.2...rel_1.1.x)
+## [unreleased](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.3.0...rel_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
+## [1.0.3.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.2.1...1.0.3.0) - 2024-11-22
 ### Fixed
 - content encoding on manufacturers list page
 
 ### Added
 - displaying content on manufacturers list page configurable
 
-## [1.1.2.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.2.0...1.1.2.1) - 2024-11-21
+## [1.0.2.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.2.0...1.0.2.1) - 2024-11-21
 ### Fixed
 - tab class for Wave based theme
 - encoding error when using the WYSIWYG editor
 
-## [1.1.2.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.1.0...1.1.2.0) - 2024-11-19
+## [1.0.2.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.1.0...1.0.2.0) - 2024-11-19
 ### Fixed
 - show hidden save button
 
 ### Added
 - hide empty HTML elements content
 
-## [1.1.1.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.0.0...1.1.1.0) - 2024-11-18
+## [1.0.1.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.0.0...1.0.1.0) - 2024-11-18
 ### Fixed
 - installation instructions
 - show manufacturer link on article details page, if manufacturer hasn't an icon
 - prevent encoding HTML entities
 
-### Added
-- display manufacturer content as additional tab on article details page
-- make displaying manufacturer tab on details page configurable
-
-## [1.1.0.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.0.0...1.1.0.0) - 2024-11-13
-### Added
-- installability OXID 6.2.3 - 6.5.x
-
 ## [1.0.0.0](https://git.d3data.de/D3Private/manufacturer-information/releases/tag/1.0.0.0) - 2024-11-13
 - initial release

Events/Events.php

@@ -0,0 +1,45 @@
+<?php
+	
+declare(strict_types=1);
+
+namespace D3\ManufacturerInformation\Events;
+
+
+use OxidEsales\Eshop\Core\DatabaseProvider;
+
+class Events
+{
+	public static function activate()
+	{
+		self::d3AddLongdescColumnsToOxmanufacturers();
+	}
+	
+	public static function deActivate()
+	{
+	
+	
+	}
+	
+	/**
+	 * @return bool
+	 * @throws Exception
+	 */
+	protected static function d3AddLongdescColumnsToOxmanufacturers()
+	{
+		try {
+			DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->execute("
+				ALTER TABLE oxmanufacturers ADD COLUMN D3DESCRIPTION TEXT NOT NULL DEFAULT '';
+				ALTER TABLE oxmanufacturers ADD COLUMN D3DESCRIPTION_1 TEXT NOT NULL DEFAULT '';
+				ALTER TABLE oxmanufacturers ADD COLUMN D3DESCRIPTION_2 TEXT NOT NULL DEFAULT '';
+				ALTER TABLE oxmanufacturers ADD COLUMN D3DESCRIPTION_3 TEXT NOT NULL DEFAULT '';
+			");
+		} catch (\Exception $e) {
+			if ((string)$e->getCode() === '1054') {
+				return true;
+			}
+			throw $e;
+		}
+		
+		return false;
+	}
+}

Modules/Application/Model/D3ManufacturerLongDesc.php

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

Modules/Application/Model/ManufacturerInfoList.php

@@ -34,22 +34,12 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent
         parent::_addCategoryFields($oManufacturer);
 
         if (Registry::getConfig()->getConfigParam('d3manufacturerinformation_showManufacturertextOnManufacturerPage')) {
-            /** @var \OxidEsales\Eshop\Core\UtilsView $oUtilsView */
-            $oUtilsView = Registry::getUtilsView();
-
-            $longdesc = $oManufacturer->d3GetLongdesc()->getRawValue() ?? '';
-            $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);
+            $oManufacturer->oxcategories__oxlongdesc = new Field(
+                html_entity_decode(
+                    $oManufacturer->getFieldData( Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME ) ?? ''
+                ),
+                Field::T_RAW
+            );
         }
     }
 }

README.md

@@ -2,10 +2,8 @@
 
 # ![D3 Logo](https://logos.oxidmodule.com/d3logo_24x24.svg) Herstellerinformationen für OXID eShop
 
-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.
+Dieses Modul fügt Ihren Herstellereinstellungen einen Tab zur
+detaillierten Beschreibung Ihrer Hersteller hinzu.
 
 ## Inhaltsverzeichnis
 
@@ -19,23 +17,14 @@ 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 require d3/manufacturerinformation:"~1.0.0"
 ```
 
 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
 
-```bash
-./vendor/bin/oe-eshop-db_migrate migrations:migrate d3manufacturerinformation
+Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
 
-./vendor/bin/oe-console o:m:i source/modules/d3/manufacturerinformation
-./vendor/bin/oe-console o:m:deact d3manufacturerinformation
-./vendor/bin/oe-console o:m:act d3manufacturerinformation
-
-./vendor/bin/oe-eshop-db_views_generate
-```
-
-Leeren Sie anschließend den Temp Ordner des Shops.
+Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner des Shops.
 
 ## Lizenz
 (Stand: 13.11.2024)

composer.json

@@ -24,13 +24,10 @@
 	"proprietary"
   ],
   "require": {
-    "php": "~7.1 || ~8.0",
-    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.4"
-  },
-  "require-dev": {
-    "oxid-esales/oxideshop-ce": "~6.14.0",
-    "friendsofphp/php-cs-fixer": "^3.9"
+    "php": ">=7.0",
+    "oxid-esales/oxideshop-ce": "v6.0 - v6.5.6"
   },
+  "require-dev": {},
   "extra": {
     "oxideshop": {
       "blacklist-filter": [

menu.xml

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

metadata.php

@@ -17,6 +17,7 @@ declare(strict_types=1);
 
 use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
 use D3\ManufacturerInformation\Application\Model\Constants;
+use D3\ManufacturerInformation\Events\Events;
 use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
 use D3\ManufacturerInformation\Modules\Application\Model\ManufacturerInfoList;
 use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer;
@@ -38,7 +39,7 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'picture.svg',
-    'version'     => '1.1.4.2',
+    'version'     => '1.0.3.0',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -49,6 +50,10 @@ $aModule = [
         OEManufacturer::class => D3ManufacturerLongDesc::class,
         OEManufacturerList::class => ManufacturerInfoList::class,
     ],
+    'events'      => [
+		'onActivate'    => Events::class.'::activate',
+		'onDeactivate'  => Events::class.'::deActivate',
+    ],
     'templates'   => [
         'd3manufacturerlongdesc.tpl'        => 'd3/manufacturerinformation/Application/views/admin/tpl/d3manufacturer_longdesc.tpl',
     ],

migration/data/Version20241023154223.php

@@ -1,63 +0,0 @@
-<?php
-
-/**
- * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\ManufacturerInformation\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\TextType;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20241023154223 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add the D3 manufacturer longdesc column';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-
-        $this->d3AddLongdescColumnToOxmanufacturers($schema);
-    }
-
-    public function down(Schema $schema): void
-    {
-    }
-
-    /**
-     * @param Schema $schema
-     * @return void
-     * @throws \Doctrine\DBAL\Schema\SchemaException
-     */
-    public function d3AddLongdescColumnToOxmanufacturers(Schema $schema)
-    {
-        $table = !$schema->hasTable('oxmanufacturers') ?
-            $schema->createTable('oxmanufacturers') :
-            $schema->getTable('oxmanufacturers');
-
-        // Beschreibung
-        if (!$table->hasColumn('D3DESCRIPTION')) {
-            $table->addColumn('D3DESCRIPTION', (new TextType())->getName())
-                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
-                ->setNotnull(true);
-        }
-    }
-}

migration/data/Version20241028172608.php

@@ -1,77 +0,0 @@
-<?php
-
-/**
- * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\ManufacturerInformation\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Types\TextType;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20241028172608 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add multilang tables for the D3 manufacturer longdesc';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->connection->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-
-        $this->d3AddLongdescMultilangColumnsToOxmanufacturers($schema);
-    }
-
-    public function down(Schema $schema): void
-    {
-    }
-
-    /**
-     * @param Schema $schema
-     * @return void
-     * @throws \Doctrine\DBAL\Schema\SchemaException
-     */
-    public function d3AddLongdescMultilangColumnsToOxmanufacturers(Schema $schema)
-    {
-        $table = !$schema->hasTable('oxmanufacturers') ?
-            $schema->createTable('oxmanufacturers') :
-            $schema->getTable('oxmanufacturers');
-
-        // lang 1
-        if (!$table->hasColumn('D3DESCRIPTION_1')) {
-            $table->addColumn('D3DESCRIPTION_1', (new TextType())->getName())
-                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
-                ->setNotnull(true);
-        }
-
-        // lang 2
-        if (!$table->hasColumn('D3DESCRIPTION_2')) {
-            $table->addColumn('D3DESCRIPTION_2', (new TextType())->getName())
-                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
-                ->setNotnull(true);
-        }
-
-        // lang 3
-        if (!$table->hasColumn('D3DESCRIPTION_3')) {
-            $table->addColumn('D3DESCRIPTION_3', (new TextType())->getName())
-                ->setLength($this->connection->getDatabasePlatform()::LENGTH_LIMIT_TEXT)
-                ->setNotnull(true);
-        }
-    }
-}

migration/migrations.yml

@@ -1,4 +0,0 @@
-name: D3 manufacturerinformation
-migrations_namespace: D3\ManufacturerInformation\Migrations
-table_name: d3migrations_manufacturerinformation
-migrations_directory: data