[Fixed] column length

remove unnecessary metadata blocks

Application/Controller/Admin/ManufacturerInfoLongdesc.php

@@ -47,7 +47,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 			}
 		}
 		
-		$this->_aViewData["editor"] = $this->generateTextEditor("100%", 280, $oManufacturer, "oxmanufacturers__d3description", "list.tpl.css");
+		$this->_aViewData["editor"] = $this->generateTextEditor("100%", 280, $oManufacturer, "oxmanufacturers__D3DESCRIPTION", "list.tpl.css");
 		
 		return "d3manufacturerlongdesc.tpl";
 	}
@@ -110,7 +110,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	 */
 	public function d3GetLongdescParamValue() :string
 	{
-		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
+		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__D3DESCRIPTION'];
 	}
 	
 	/**

Application/Model/Constants.php

@@ -10,5 +10,5 @@ class Constants
 	public const OXID_MODULE_ID = 'd3manufacturerinformation';
 	
 	// Tables and Database
-	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'd3description';
+	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'D3DESCRIPTION';
 }

Application/views/admin/de/d3manufacturerinformation_lang.php

@@ -7,7 +7,5 @@ $sLangName = "Deutsch";
 $aLang = array(
     'charset'                                   => 'UTF-8',
 	
-    'mxd3manufacturerinfolongdesc'                         => 'Langtext',
+    'mxd3manufacturerinfolongdesc'                                   => 'Langtext',
-    'SHOP_MODULE_GROUP_d3manufacturerinformation_main'     => 'Einstellungen',
-    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen'
 );

Application/views/admin/en/d3manufacturerinformation_lang.php

@@ -7,7 +7,5 @@ $sLangName = "Deutsch";
 $aLang = array(
 	'charset'                                   => 'UTF-8',
 	
-	'mxd3manufacturerinfolongdesc'                         => 'Text',
+	'mxd3manufacturerinfolongdesc'                                   => 'Text',
-    'SHOP_MODULE_GROUP_d3manufacturerinformation_main'     => 'Settings',
-    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'display existing manufacturer texts on item details as a tab'
 );

Application/views/admin/tpl/d3manufacturer_longdesc.tpl

@@ -25,7 +25,7 @@
     <input type="hidden" name="editlanguage" value="[{$editlanguage}]">
 </form>
 
-<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__d3description' );" style="padding: 0;margin: 0;height:0;">
+<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__D3DESCRIPTION' );" style="padding: 0px;margin: 0px;height:0px;">
     [{$oViewConf->getHiddenSid()}]
     <input type="hidden" name="cl" value="d3manufacturerinfolongdesc">
     <input type="hidden" name="fnc" value="">
@@ -33,7 +33,7 @@
     <input type="hidden" name="voxid" value="[{$oxid}]">
     <input type="hidden" name="editval[oxmanufacturers__oxid]" value="[{$oxid}]">
     <input type="hidden" name="catlang" value="[{$catlang}]">
-    <input type="hidden" name="editval[oxmanufacturers__d3description]" value="">
+    <input type="hidden" name="editval[oxmanufacturers__D3DESCRIPTION]" value="">
 
     [{include file="include/category_text_editor.tpl"}]
 </form>

Application/views/blocks/page/details/inc/details_productmain_manufacturersicon.html.tpl

@@ -1,10 +0,0 @@
-[{if $oManufacturer->oxmanufacturers__oxicon->value}]
-    [{$smarty.block.parent}]
-[{else}]
-    <div class="action-links text-left">
-        <a href="[{$oManufacturer->getLink()}]" title="[{$oManufacturer->oxmanufacturers__oxtitle->value}]">
-            [{oxmultilang ident="MANUFACTURER" suffix="COLON"}] [{$oManufacturer->oxmanufacturers__oxtitle->value}]
-        </a>
-        <span itemprop="brand" class="hidden">[{$oManufacturer->oxmanufacturers__oxtitle->value}]</span>
-    </div>
-[{/if}]

Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl

@@ -1,16 +0,0 @@
-[{$smarty.block.parent}]
-
-[{assign var="oConfig"       value=$oViewConf->getConfig()}]
-[{assign var="oManufacturer" value=$oView->getManufacturer()}]
-[{assign var="sShopURL"      value=$oConfig->getConfigParam('sShopURL')}]
-[{assign var="description"   value=$oManufacturer->d3GetLongdesc()}]
-
-[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->value}]
-    [{capture append="tabs"}]<a href="#manufacturertab" data-toggle="tab">[{oxmultilang ident="MANUFACTURER"}]</a>[{/capture}]
-    [{capture append="tabsContent"}]
-        <div id="manufacturertab" class="tab-pane[{if $blFirstTab}] active[{/if}]">
-            [{oxeval var=$description}]
-        </div>
-        [{assign var="blFirstTab" value=false}]
-    [{/capture}]
-[{/if}]

CHANGELOG.md

@@ -4,13 +4,9 @@ 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/D3Public/MyModule/compare/1.0.1.0...rel_1.x)
+## [1.1.0.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.1.0.0) - 2024-11-13
-
+### Added
-## [1.0.1.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.0.1.0) - 2024-11-18
+- installability OXID 6.2.3 - 6.5.x
-### Fixed
-- installation instructions
-- show manufacturer link on article details page, if manufacturer hasn't an icon
-- prevent encoding HTML entities
 
 ## [1.0.0.0](https://git.d3data.de/D3Public/MyModule/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;
-	}
-}

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -7,7 +7,6 @@ namespace D3\ManufacturerInformation\Modules\Application\Model;
 
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\Eshop\Application\Model\Manufacturer;
-use OxidEsales\Eshop\Core\Field;
 use OxidEsales\Eshop\Core\Registry;
 
 class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
@@ -31,11 +30,10 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
 	}
 	
 	/**
-	 * @return Field
+	 * @return string
 	 */
-	public function d3GetLongdesc(): Field
+	public function d3GetLongdesc(): string
 	{
-        $longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+		return $this->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
-		return $this->$longName;
 	}
 }

README.md

@@ -2,8 +2,7 @@
 
 # ![D3 Logo](https://logos.oxidmodule.com/d3logo_24x24.svg) Herstellerinformationen für OXID eShop
 
-Dieses Modul fügt Ihren Herstellereinstellungen einen Tab zur
+Fügt die Möglichkeit zur Langtextbeschreibung den Hersteller hinzu
-detaillierten Beschreibung Ihrer Hersteller hinzu.
 
 ## Inhaltsverzeichnis
 
@@ -18,7 +17,13 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 
 
 ```bash
-composer require d3/manufacturerinformation:"~1.0"
+composer require d3/manufacturerinformation:"~1.1"
+
+./vendor/bin/oe-eshop-db_migrate migrations:migrate d3manufacturerinformation
+
+./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
 ```
 
 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.

composer.json

@@ -24,8 +24,8 @@
 	"proprietary"
   ],
   "require": {
-    "php": ">=7.0",
+    "php": "~7.0 || ~8.0",
-    "oxid-esales/oxideshop-ce": "v6.0 - v6.5.6"
+    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.3"
   },
   "require-dev": {
     "phpunit/phpunit" : "^9.5",

metadata.php

@@ -15,7 +15,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;
@@ -37,7 +36,7 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.0.1.0',
+    'version'     => '1.1.0.0',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -48,31 +47,7 @@ $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',
     ],
-    'settings'    => [
-        [
-            'group'     => $sModuleId.'_main',
-            'name'      => $sModuleId.'_showManufacturertextOnDetailsPage',
-            'type'      => 'bool',
-            'value'     => true
-        ],
-    ],
-    'blocks'      => [
-        [
-            'template'  => 'page/details/inc/productmain.tpl',
-            'block'     => 'details_productmain_manufacturersicon',
-            'file'      => 'Application/views/blocks/page/details/inc/details_productmain_manufacturersicon.html.tpl',
-        ],
-        [
-            'template'  => 'page/details/inc/tabs.tpl',
-            'block'     => 'details_tabs_invite',
-            'file'      => 'Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl',
-        ],
-    ]
 ];

migration/data/Version20241023154223.php

@@ -0,0 +1,48 @@
+<?php
+
+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 'Adds 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,62 @@
+<?php
+
+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 'Adds 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