adjust version information

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,5 +7,7 @@ $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,5 +7,7 @@ $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: 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,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

@@ -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,16 @@
+[{$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,6 +4,18 @@ 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.1.0...rel_1.1.x)
+
+## [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

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -7,6 +7,7 @@ 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 +31,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;
 	}
 }

README.md

@@ -18,19 +18,21 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 
 ```bash
 composer require d3/manufacturerinformation:"~1.1"
+```
 
+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
 
 ./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.
-
-Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
-
-Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner des Shops.
+Leeren Sie anschließend den Temp Ordner des Shops.
 
 
 ## Lizenz

metadata.php

@@ -36,7 +36,7 @@ $aModule = [
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.1.0.0',
+    'version'     => '1.1.1.0',
     'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -50,4 +50,24 @@ $aModule = [
     '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',
+        ],
+    ]
 ];