adjust version information

remove unnecessary metadata blocks

.noencode

@@ -1 +0,0 @@
-copyAsIsFiles=metadata.php, .php-cs-fixer.php, IntelliSenseHelper.php, migration, Application/views

.php-cs-fixer.php

@@ -1,34 +0,0 @@
-<?php
-
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__)
-;
-
-$header = <<<EOF
-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
-EOF;
-
-$config = new PhpCsFixer\Config();
-return $config->setRules([
-        '@PHP80Migration' => true,
-        '@PSR12' => true,
-        'header_comment' => [
-            'comment_type' => 'PHPDoc',
-            'header' => $header,
-            'location' => 'after_open',
-            'separate' => 'both',
-        ],
-        'php_unit_test_class_requires_covers' => true,
-        'doctrine_annotation_indentation' => true,
-    ])
-    ->setFinder($finder)
-;

Application/Controller/Admin/ManufacturerInfoLongdesc.php

@@ -1,18 +1,5 @@
 <?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\Application\Controller\Admin;
@@ -25,100 +12,120 @@ use OxidEsales\Eshop\Core\Registry;
 
 class ManufacturerInfoLongdesc extends AdminDetailsController
 {
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    public function render()
+	public function render()
-    {
+	{
-        parent::render();
+		parent::render();
-
+		
-        $this->_aViewData['edit'] = $oManufacturer = oxNew(\OxidEsales\Eshop\Application\Model\Manufacturer::class);
+		$this->_aViewData['edit'] = $oManufacturer = oxNew(\OxidEsales\Eshop\Application\Model\Manufacturer::class);
-
+		
-        $sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId();
+		$sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId();
-        if (isset($sOXID) && $sOXID != "-1") {
+		if (isset($sOXID) && $sOXID != "-1") {
-            // load object
+			// load object
-            $d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang");
+			$d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang");
-
+			
-            if (!isset($d3manufacturerlang)) {
+			if (!isset($d3manufacturerlang)) {
-                $d3manufacturerlang = $this->_iEditLang;
+				$d3manufacturerlang = $this->_iEditLang;
-            }
+			}
-
+			
-            $this->_aViewData["catlang"] = $d3manufacturerlang;
+			$this->_aViewData["catlang"] = $d3manufacturerlang;
-
+			
-            $oManufacturer->loadInLang($d3manufacturerlang, $sOXID);
+			$oManufacturer->loadInLang($d3manufacturerlang, $sOXID);
-
+			
-            //Disable editing for derived items
+			//Disable editing for derived items
-            if ($oManufacturer->isDerived()) {
+			if ($oManufacturer->isDerived()) {
-                $this->_aViewData['readonly'] = true;
+				$this->_aViewData['readonly'] = true;
-            }
+			}
-
+			
-            foreach (\OxidEsales\Eshop\Core\Registry::getLang()->getLanguageNames() as $id => $language) {
+			foreach (\OxidEsales\Eshop\Core\Registry::getLang()->getLanguageNames() as $id => $language) {
-                $oLang = new \stdClass();
+				$oLang = new \stdClass();
-                $oLang->sLangDesc = $language;
+				$oLang->sLangDesc = $language;
-                $oLang->selected = ($id == $this->_iEditLang);
+				$oLang->selected = ($id == $this->_iEditLang);
-                $this->_aViewData["otherlang"][$id] = clone $oLang;
+				$this->_aViewData["otherlang"][$id] = clone $oLang;
-            }
+			}
-        }
+		}
-
+		
-        $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";
+		return "d3manufacturerlongdesc.tpl";
-    }
+	}
-
+	
-    /**
+	/**
-     * @return void
+	 * @return void
-     * @throws \Exception
+	 * @throws \Exception
-     */
+	 */
-    public function save()
+	public function save()
-    {
+	{
-        parent::save();
+		parent::save();
-
+		
-        $iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang"));
+		$iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang"));
-        $sOXID = $this->getEditObjectId();
+		$sOXID = $this->getEditObjectId();
-        $this->setEditObjectId($sOXID);
+		$this->setEditObjectId($sOXID);
-
+		
-        if ($sOXID == "-1") {
+		if ($sOXID == "-1") {
-            return;
+			return;
-        }
+		}
-
+		
-        /** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */
+		/** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */
-        $oManufacturer = oxNew(Manufacturer::class);
+		$oManufacturer = oxNew(Manufacturer::class);
-        $oManufacturer->loadInLang($iManufacturerLang, $sOXID);
+		$oManufacturer->loadInLang($iManufacturerLang, $sOXID);
-
+		
-        if (!$oManufacturer->load($sOXID)) {
+		if (!$oManufacturer->load($sOXID)) {
-            return;
+			return;
-        }
+		}
-
+		
-        $aParams = Registry::getRequest()->getRequestEscapedParameter("editval");
+		$aParams = Registry::getRequest()->getRequestEscapedParameter("editval");
-        $oManufacturer->assign($aParams);
+		$oManufacturer->assign($aParams);
-
+		
-        if (false === is_null($this->d3GetLongdescParamValue())) {
+		if (false === is_null($this->d3GetLongdescParamValue())) {
-            $oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue());
+			$oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue());
-            $oManufacturer->save();
+			$oManufacturer->save();
-        }
+		}
-    }
+	}
-
+	
-    /**
+	/**
-     * @return string
+	 * Returns string which must be edited by editor
-     */
+	 *
-    public function d3GetLongdescParamValue(): string
+	 * @param \OxidEsales\Eshop\Core\Model\BaseModel $oObject object with field will be used for editing
-    {
+	 * @param string                                 $sField  name of editable field
-        return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
+	 *
-    }
+	 * @return string
-
+	 * @deprecated underscore prefix violates PSR12, will be renamed to "getEditValue" in next major
-    /**
+	 */
-     * inhaltliche Uebernahme analog Article_Main
+	protected function _getEditValue($oManufacturer, $sField) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-     * wird genutzt zum Abspeichern der Artikel-Langbeschreibung
+	{
-     *
+		$sEditObjectValue = '';
-     * @param $sValue
+		
-     *
+		if ($oManufacturer and $oManufacturer->getId()) {
-     * @return mixed
+			$sEditObjectValue = $this->_processEditValue($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
-     */
+		}
-    protected function _processLongDesc($sValue)
+		
-    {
+		return $sEditObjectValue;
-        $aSearch  = ['&amp;nbsp;', '&amp;', '&quot;', '&lang=', '<p>&nbsp;</p>', '<p>&nbsp; </p>'];
+	}
-        $aReplace = ['&nbsp;', '&', '"', '&amp;lang=', '', ''];
+	
-
+	/**
-        return str_replace($aSearch, $aReplace, $sValue);
+	 * @return string
-    }
+	 */
-}
+	public function d3GetLongdescParamValue() :string
+	{
+		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
+	}
+	
+	/**
+	 * inhaltliche Uebernahme analog Article_Main
+	 * wird genutzt zum Abspeichern der Artikel-Langbeschreibung
+	 *
+	 * @param $sValue
+	 *
+	 * @return mixed
+	 */
+	protected function _processLongDesc($sValue)
+	{
+		$aSearch  = ['&amp;nbsp;', '&amp;', '&quot;', '&lang=', '<p>&nbsp;</p>', '<p>&nbsp; </p>'];
+		$aReplace = ['&nbsp;', '&', '"', '&amp;lang=', '', ''];
+		
+		return str_replace($aSearch, $aReplace, $sValue);
+	}
+}

Application/Model/Constants.php

@@ -1,26 +1,14 @@
 <?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\Application\Model;
 
+
 class Constants
 {
-    public const OXID_MODULE_ID = 'd3manufacturerinformation';
+	public const OXID_MODULE_ID = 'd3manufacturerinformation';
-
+	
-    // Tables and Database
+	// Tables and Database
-    public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'd3description';
+	public const D3_OXMANUFACTURERS_LONGDESC_FIELDNAME = 'd3description';
-}
+}

Application/views/admin/de/d3manufacturerinformation_lang.php

@@ -1,26 +1,13 @@
 <?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
- */
-
 $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = [
+$aLang = array(
     'charset'                                   => 'UTF-8',
-
+	
     'mxd3manufacturerinfolongdesc'                         => 'Langtext',
     'SHOP_MODULE_GROUP_d3manufacturerinformation_main'     => 'Einstellungen',
-    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen',
+    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen'
-];
+);

Application/views/admin/en/d3manufacturerinformation_lang.php

@@ -1,26 +1,13 @@
 <?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
- */
-
 $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = [
+$aLang = array(
-    'charset'                                   => 'UTF-8',
+	'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',
+    'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage'   => 'display existing manufacturer texts on item details as a tab'
-];
+);

Application/views/admin/tpl/d3manufacturer_longdesc.tpl

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

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

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

CHANGELOG.md

@@ -4,25 +4,21 @@ 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.2.1...rel_1.x)
+## [unreleased](https://git.d3data.de/D3Public/MyModule/compare/1.1.1.0...rel_1.1.x)
 
-## [1.0.2.1](https://git.d3data.de/D3Public/MyModule/compare/1.0.2.0...1.0.2.1) - 2024-11-21
+## [1.1.1.0](https://git.d3data.de/D3Public/MyModule/compare/1.1.0.0...1.1.1.0) - 2024-11-18
-### Fixed
-- tab class for Wave based theme
-- encoding error when using the WYSIWYG editor
-
-## [1.0.2.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.1.0...1.0.2.0) - 2024-11-19
-### Fixed
-- show hidden save button
-
-### Added
-- hide empty HTML elements content
-
-## [1.0.1.0](https://git.d3data.de/D3Public/MyModule/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/D3Public/MyModule/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/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;
-	}
-}

IntelliSenseHelper.php

@@ -1,23 +1,21 @@
 <?php
 
 /**
- * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+ * This Software is the property of Data Development and is protected
- *
+ * by copyright law - it is NOT Freeware.
- * For the full copyright and license information, please view
+ * Any unauthorized use of this software without a valid license
- * the LICENSE file that was distributed with this source code.
+ * is a violation of the license agreement and will be prosecuted by
- *
+ * civil and criminal law.
- * https://www.d3data.de
+ * http://www.shopmodule.com
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      https://www.oxidmodule.com
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\ManufacturerInformation\Modules\Application\Model{
-
+	
-    use OxidEsales\Eshop\Application\Model\Manufacturer;
+	use OxidEsales\Eshop\Application\Model\Manufacturer;
-
+	
-    class D3ManufacturerLongDesc_parent extends Manufacturer
+	class D3ManufacturerLongDesc_parent extends Manufacturer {}
-    {
+}
-    }
-}

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -1,22 +1,10 @@
 <?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\Modules\Application\Model;
 
+
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\Eshop\Application\Model\Manufacturer;
 use OxidEsales\Eshop\Core\Field;
@@ -24,30 +12,30 @@ use OxidEsales\Eshop\Core\Registry;
 
 class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
 {
-    /**
+	/**
-     * @param string $sValue
+	 * @param string $sValue
-     * @return void
+	 * @return void
-     */
+	 */
-    public function d3SetLongdesc(string $sValue): bool
+	public function d3SetLongdesc(string $sValue) :bool
-    {
+	{
-        if ($this->getId() and $this->isLoaded()) {
+		if ($this->getId() and $this->isLoaded()){
-            try {
+			try {
-                $this->assign([Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME => $sValue]);
+				$this->assign([Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME => $sValue]);
-                $this->save();
+				$this->save();
-            } catch (\Exception $exception) {
+			}catch (\Exception $exception){
-                Registry::getLogger()->error($exception->getMessage());
+				Registry::getLogger()->error($exception->getMessage());
-            }
+			}
-        }
+		}
-
+		
-        return true;
+		return true;
-    }
+	}
-
+	
-    /**
+	/**
-     * @return Field
+	 * @return Field
-     */
+	 */
-    public function d3GetLongdesc(): Field
+	public function d3GetLongdesc(): Field
-    {
+	{
         $longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
-        return $this->$longName;
+		return $this->$longName;
-    }
+	}
-}
+}

Modules/Application/Model/ManufacturerInfoList.php

@@ -1,22 +1,10 @@
 <?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\Modules\Application\Model;
 
+
 use D3\ManufacturerInformation\Application\Model\Constants;
 use OxidEsales\Eshop\Application\Model\Manufacturer;
 use OxidEsales\Eshop\Application\Model\ManufacturerList;
@@ -24,14 +12,14 @@ use OxidEsales\Eshop\Core\Field;
 
 class ManufacturerInfoList extends ManufacturerInfoList_parent
 {
-    /**
+	/**
-     * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer
+	 * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer
-     * @return void
+	 * @return void
-     */
+	 */
-    protected function _addCategoryFields($oManufacturer)
+	protected function _addCategoryFields($oManufacturer)
-    {
+	{
-        parent::_addCategoryFields($oManufacturer);
+		parent::_addCategoryFields($oManufacturer);
-
+		
-        $oManufacturer->oxcategories__oxlongdesc = new Field($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME), Field::T_RAW);
+		$oManufacturer->oxcategories__oxlongdesc = new Field($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME), Field::T_RAW);
-    }
+	}
-}
+}

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
 
@@ -16,15 +15,25 @@ 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 require d3/manufacturerinformation:"~1.0.0"
+composer require d3/manufacturerinformation:"~1.1"
 ```
 
 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
+
+./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,10 +24,14 @@
 	"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",
+    "friendsofphp/php-cs-fixer": "^3.9",
+    "phpstan/phpstan": "^1.8"
   },
-  "require-dev": {},
   "extra": {
     "oxideshop": {
       "blacklist-filter": [
@@ -43,9 +47,5 @@
     "psr-4": {
       "D3\\ManufacturerInformation\\": "../../../source/modules/d3/manufacturerinformation"
     }
-  },
-  "scripts": {
-    "php-cs-fixer_audit": "./vendor/bin/php-cs-fixer list-files --config=./vendor/d3/manufacturerinformation/.php-cs-fixer.php",
-    "php-cs-fixer_fix": "./vendor/bin/php-cs-fixer fix --config=./vendor/d3/manufacturerinformation/.php-cs-fixer.php"
   }
 }

metadata.php

@@ -1,23 +1,20 @@
 <?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.
- * 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>
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
  * @link      https://www.oxidmodule.com
  */
 
 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,30 +36,26 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.0.2.1',
+    'version'     => '1.1.1.0',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'controllers' => [
-        "d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class,
+		"d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class
     ],
     'extend'      => [
-        OEManufacturer::class => D3ManufacturerLongDesc::class,
+		OEManufacturer::class => D3ManufacturerLongDesc::class,
-        OEManufacturerList::class => ManufacturerInfoList::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',
+	    'd3manufacturerlongdesc.tpl'        => 'd3/manufacturerinformation/Application/views/admin/tpl/d3manufacturer_longdesc.tpl',
     ],
     'settings'    => [
         [
             'group'     => $sModuleId.'_main',
             'name'      => $sModuleId.'_showManufacturertextOnDetailsPage',
             'type'      => 'bool',
-            'value'     => true,
+            'value'     => true
         ],
     ],
     'blocks'      => [
@@ -76,5 +69,5 @@ $aModule = [
             '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