fix wrong admin menu section

# Conflicts:
#	CHANGELOG.md
#	metadata.php

Application/views/admin/tpl/d3manufacturer_longdesc.tpl

@@ -35,7 +35,7 @@
     <input type="hidden" name="catlang" value="[{$catlang}]">
     <input type="hidden" name="editval[oxmanufacturers__d3description]" value="">
 
-    <div style="margin-bottom: 40px; padding-bottom: 60px">
+    <div style="margin-bottom: 40px">
         [{include file="include/category_text_editor.tpl"}]
     </div>
 </form>

CHANGELOG.md

@@ -4,48 +4,56 @@ 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.0.4.1...rel_1.x)
+## [unreleased](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.4.1...rel_1.1.x)
 
-## [1.0.4.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.4.0...1.0.4.1) - 2024-12-12
+## [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.0.4.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.3.1...1.0.4.0) - 2024-12-05
+## [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.0.3.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.3.0...1.0.3.1) - 2024-11-26
+## [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.0.3.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.2.1...1.0.3.0) - 2024-11-22
+## [1.1.3.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.2.1...1.1.3.0) - 2024-11-22
 ### 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
+## [1.1.2.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.2.0...1.1.2.1) - 2024-11-21
 ### Fixed
 - tab class for Wave based theme
 - encoding error when using the WYSIWYG editor
 
-## [1.0.2.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.1.0...1.0.2.0) - 2024-11-19
+## [1.1.2.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.1.0...1.1.2.0) - 2024-11-19
 ### Fixed
 - show hidden save button
 
 ### Added
 - hide empty HTML elements content
 
-## [1.0.1.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.0.0...1.0.1.0) - 2024-11-18
+## [1.1.1.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.1.0.0...1.1.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

@@ -1,45 +0,0 @@
-<?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;
-	}
-}

README.md

@@ -20,14 +20,22 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 
 ```bash
 composer config repositories.d3manufacturerinformation vcs https://git.d3data.de/D3Public/manufacturer-information.git
-composer require d3/manufacturerinformation:"~1.0.0"
+composer require d3/manufacturerinformation:"~1.1.0"
 ```
 
 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
 
-Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
+```bash
+./vendor/bin/oe-eshop-db_migrate migrations:migrate d3manufacturerinformation
 
-Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner des Shops.
+./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.
 
 ## Lizenz
 (Stand: 13.11.2024)

composer.json

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

metadata.php

@@ -17,7 +17,6 @@ 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;
@@ -39,7 +38,7 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'picture.svg',
-    'version'     => '1.0.4.1',
+    'version'     => '1.1.4.1',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -50,10 +49,6 @@ $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

@@ -0,0 +1,63 @@
+<?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

@@ -0,0 +1,77 @@
+<?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

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