adjust version information

.noencode

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

.php-cs-fixer.php

@@ -0,0 +1,34 @@
+<?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,5 +1,18 @@
 <?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;
@@ -47,7 +60,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";
     }
@@ -85,32 +98,12 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
         }
     }
 
-	/**
-	 * Returns string which must be edited by editor
-	 *
-	 * @param \OxidEsales\Eshop\Core\Model\BaseModel $oObject object with field will be used for editing
-	 * @param string                                 $sField  name of editable field
-	 *
-	 * @return string
-	 * @deprecated underscore prefix violates PSR12, will be renamed to "getEditValue" in next major
-	 */
-	protected function _getEditValue($oManufacturer, $sField) // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-	{
-		$sEditObjectValue = '';
-		
-		if ($oManufacturer and $oManufacturer->getId()) {
-			$sEditObjectValue = $this->_processEditValue($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
-		}
-		
-		return $sEditObjectValue;
-	}
-	
     /**
      * @return string
      */
     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

@@ -1,14 +1,26 @@
 <?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';
 
     // 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,11 +1,26 @@
 <?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 = array(
+$aLang = [
     'charset'                                   => 'UTF-8',
 
     '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

@@ -1,11 +1,26 @@
 <?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 = array(
+$aLang = [
     'charset'                                   => 'UTF-8',
 
     '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: 0px;margin: 0px;height:0px;">
+<form name="myedit" id="myedit" action="[{$oViewConf->getSelfLink()}]" method="post" onSubmit="copyLongDesc( 'oxmanufacturers__d3description' );" style="padding: 0;margin: 0;height:0;">
     [{$oViewConf->getHiddenSid()}]
     <input type="hidden" name="cl" value="d3manufacturerinfolongdesc">
     <input type="hidden" name="fnc" value="">
@@ -33,9 +33,11 @@
     <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="">
 
+    <div style="margin-bottom: 40px">
         [{include file="include/category_text_editor.tpl"}]
+    </div>
 </form>
 
 [{include file="bottomnaviitem.tpl"}]

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

@@ -0,0 +1,10 @@
+[{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

@@ -0,0 +1,18 @@
+[{$smarty.block.parent}]
+
+[{assign var="oManufacturer" value=$oView->getManufacturer()}]
+[{if $oManufacturer && $oManufacturer->getId()}]
+    [{assign var="oConfig"       value=$oViewConf->getConfig()}]
+    [{assign var="sShopURL"      value=$oConfig->getConfigParam('sShopURL')}]
+    [{assign var="description"   value=$oManufacturer->d3GetLongdesc()}]
+
+    [{if $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->rawValue|strip_tags|trim}]
+        [{capture append="tabs"}]<a href="#manufacturertab" class="nav-link[{if $blFirstTab}] active[{/if}]" 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}]
+[{/if}]

CHANGELOG.md

@@ -4,6 +4,30 @@ 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.1.2.1...rel_1.1.x)
+
+## [1.1.2.1](https://git.d3data.de/D3Public/MyModule/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.1.2.0](https://git.d3data.de/D3Public/MyModule/compare/1.1.1.0...1.1.2.0) - 2024-11-19
+### Fixed
+- show hidden save button
+
+### Added
+- hide empty HTML elements content
+
+## [1.1.1.0](https://git.d3data.de/D3Public/MyModule/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/D3Public/MyModule/compare/1.0.0.0...1.1.0.0) - 2024-11-13
 ### Added
 - installability OXID 6.2.3 - 6.5.x

IntelliSenseHelper.php

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

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -1,12 +1,25 @@
 <?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;
 use OxidEsales\Eshop\Core\Registry;
 
 class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
@@ -30,10 +43,11 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
     }
 
     /**
-	 * @return string
+     * @return Field
      */
-	public function d3GetLongdesc(): string
+    public function d3GetLongdesc(): Field
     {
-		return $this->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+        $longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
+        return $this->$longName;
     }
 }

Modules/Application/Model/ManufacturerInfoList.php

@@ -1,10 +1,22 @@
 <?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;

README.md

@@ -15,23 +15,23 @@ 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.1.0"
+```
+
+Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
 
 ```bash
-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
+
+./vendor/bin/oe-eshop-db_views_generate
 ```
 
-Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
+Leeren Sie anschließend den Temp Ordner des Shops.
-
-Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
-
-Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner des Shops.
-
 
 ## Lizenz
 (Stand: 13.11.2024)

composer.json

@@ -24,13 +24,12 @@
 	"proprietary"
   ],
   "require": {
-    "php": "~7.0 || ~8.0",
+    "php": "~7.1 || ~8.0",
     "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.3"
   },
   "require-dev": {
-    "phpunit/phpunit" : "^9.5",
+    "oxid-esales/oxideshop-ce": "~6.14.0",
-    "friendsofphp/php-cs-fixer": "^3.9",
+    "friendsofphp/php-cs-fixer": "^3.9"
-    "phpstan/phpstan": "^1.8"
   },
   "extra": {
     "oxideshop": {
@@ -47,5 +46,9 @@
     "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,13 +1,15 @@
 <?php
 
 /**
- * For the full copyright and license information, please view the LICENSE
+ * Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
- * 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 - Daniel Seifert <info@shopmodule.com>
+ * @author    D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
  * @link      https://www.oxidmodule.com
  */
 
@@ -36,18 +38,38 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.1.0.0',
+    'version'     => '1.1.2.1',
     '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,
-	    OEManufacturerList::class => ManufacturerInfoList::class
+        OEManufacturerList::class => ManufacturerInfoList::class,
     ],
     '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

@@ -1,5 +1,18 @@
 <?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;
@@ -26,14 +39,16 @@ final class Version20241023154223 extends AbstractMigration
     }
 
     public function down(Schema $schema): void
-    {}
+    {
+    }
 
     /**
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Schema\SchemaException
      */
-	public function d3AddLongdescColumnToOxmanufacturers(Schema $schema){
+    public function d3AddLongdescColumnToOxmanufacturers(Schema $schema)
+    {
         $table = !$schema->hasTable('oxmanufacturers') ?
             $schema->createTable('oxmanufacturers') :
             $schema->getTable('oxmanufacturers');

migration/data/Version20241028172608.php

@@ -1,5 +1,18 @@
 <?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;
@@ -26,14 +39,16 @@ final class Version20241028172608 extends AbstractMigration
     }
 
     public function down(Schema $schema): void
-    {}
+    {
+    }
 
     /**
      * @param Schema $schema
      * @return void
      * @throws \Doctrine\DBAL\Schema\SchemaException
      */
-	public function d3AddLongdescMultilangColumnsToOxmanufacturers(Schema $schema){
+    public function d3AddLongdescMultilangColumnsToOxmanufacturers(Schema $schema)
+    {
         $table = !$schema->hasTable('oxmanufacturers') ?
             $schema->createTable('oxmanufacturers') :
             $schema->getTable('oxmanufacturers');