[Fixed] readme

Application/Controller/Admin/ManufacturerInfoLongdesc.php

@@ -19,12 +19,13 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	{
 		parent::render();
 		
+		/** @var Manufacturer|D3ManufacturerLongDesc $oManufacturer */
 		$this->_aViewData['edit'] = $oManufacturer = oxNew(\OxidEsales\Eshop\Application\Model\Manufacturer::class);
 		
 		$sOXID = $this->_aViewData["oxid"] = $this->getEditObjectId();
 		if (isset($sOXID) && $sOXID != "-1") {
 			// load object
-			$d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang");
+			$d3manufacturerlang = \OxidEsales\Eshop\Core\Registry::getRequest()->getRequestEscapedParameter("catlang");
 			
 			if (!isset($d3manufacturerlang)) {
 				$d3manufacturerlang = $this->_iEditLang;
@@ -47,9 +48,9 @@ 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, $oManufacturer->getD3LongDescTableColumnName(), "list.css");
 		
-		return "d3manufacturerlongdesc.tpl";
+		return "@d3manufacturerinformation/admin/d3manufacturerlongdesc";
 	}
 	
 	/**
@@ -60,7 +61,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	{
 		parent::save();
 		
-		$iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getConfig()->getRequestParameter("catlang"));
+		$iManufacturerLang = intval(\OxidEsales\Eshop\Core\Registry::getRequest()->getRequestEscapedParameter("catlang"));
 		$sOXID = $this->getEditObjectId();
 		$this->setEditObjectId($sOXID);
 		
@@ -79,38 +80,35 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 		$aParams = Registry::getRequest()->getRequestEscapedParameter("editval");
 		$oManufacturer->assign($aParams);
 		
-		if (false === is_null($this->d3GetLongdescParamValue())) {
+		if (false === is_null($this->d3GetLongdescParamValue($oManufacturer))) {
-			$oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue());
+			$oManufacturer->d3SetLongdesc($this->d3GetLongdescParamValue($oManufacturer));
 			$oManufacturer->save();
 		}
 	}
 	
 	/**
-	 * Returns string which must be edited by editor
+	 * @param $oManufacturer
-	 *
+	 * @param $sField
-	 * @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
+	protected function getEditValue($oManufacturer, $sField)
 	{
 		$sEditObjectValue = '';
 		
 		if ($oManufacturer and $oManufacturer->getId()) {
-			$sEditObjectValue = $this->_processEditValue($oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME));
+			$sEditObjectValue = $oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
 		}
 		
 		return $sEditObjectValue;
 	}
 	
 	/**
+	 * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer
 	 * @return string
 	 */
-	public function d3GetLongdescParamValue() :string
+	public function d3GetLongdescParamValue(Manufacturer $oManufacturer) :string
 	{
-		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__D3DESCRIPTION'];
+		return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")[$oManufacturer->getD3LongDescTableColumnName()];
 	}
 	
 	/**
@@ -121,7 +119,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
 	 *
 	 * @return mixed
 	 */
-	protected function _processLongDesc($sValue)
+	protected function processLongDesc($sValue)
 	{
 		$aSearch  = ['&amp;nbsp;', '&amp;', '&quot;', '&lang=', '<p>&nbsp;</p>', '<p>&nbsp; </p>'];
 		$aReplace = ['&nbsp;', '&', '"', '&amp;lang=', '', ''];

Application/views/admin_twig/de/d3manufacturerinformation_lang.php

@@ -0,0 +1,11 @@
+<?php
+
+$sLangName = "Deutsch";
+// -------------------------------
+// RESOURCE IDENTITFIER = STRING
+// -------------------------------
+$aLang = array(
+    'charset'                                   => 'UTF-8',
+	
+    'mxd3manufacturerinfolongdesc'                                   => 'Langtext',
+);

Application/views/admin_twig/en/d3manufacturerinformation_lang.php

@@ -0,0 +1,11 @@
+<?php
+
+$sLangName = "Deutsch";
+// -------------------------------
+// RESOURCE IDENTITFIER = STRING
+// -------------------------------
+$aLang = array(
+	'charset'                                   => 'UTF-8',
+	
+	'mxd3manufacturerinfolongdesc'                                   => 'Text',
+);

CHANGELOG.md

@@ -4,6 +4,10 @@ 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).
 
+## [2.0.0.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.1.0.0) - 2024-11-16
+### Added
+- installability OXID 7.0 - 7.1
+
 ## [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

@@ -16,6 +16,9 @@
 namespace D3\ManufacturerInformation\Modules\Application\Model{
 	
 	use OxidEsales\Eshop\Application\Model\Manufacturer;
+	use OxidEsales\Eshop\Application\Model\ManufacturerList;
 	
 	class D3ManufacturerLongDesc_parent extends Manufacturer {}
+	
+	class ManufacturerInfoList_parent extends ManufacturerList {}
 }

Modules/Application/Model/D3ManufacturerLongDesc.php

@@ -36,4 +36,12 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
 	{
 		return $this->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
 	}
+	
+	/**
+	 * @return string
+	 */
+	public function getD3LongDescTableColumnName() :string
+	{
+		return $sParamName = $this->getViewName(true).'__'.Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME;
+	}
 }

Modules/Application/Model/ManufacturerInfoList.php

@@ -16,9 +16,9 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent
 	 * @param Manufacturer|D3ManufacturerLongDesc $oManufacturer
 	 * @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);
 	}

README.md

@@ -17,13 +17,13 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 
 
 ```bash
-composer require d3/manufacturerinformation:"~1.1"
+composer require d3/manufacturerinformation:"~2"
 
 ./vendor/bin/oe-eshop-db_migrate migrations:migrate d3manufacturerinformation
 
-./vendor/bin/oe-console o:m:i source/modules/d3/manufacturerinformation
+./vendor/bin/oe-console oe:module:install ./vendor/d3/manufacturerinformation/
-./vendor/bin/oe-console o:m:deact d3manufacturerinformation
+./vendor/bin/oe-console oe:module:activate d3manufacturerinformation
-./vendor/bin/oe-console o:m:act d3manufacturerinformation
+./vendor/bin/oe-console oe:module:deactivate d3manufacturerinformation
 ```
 
 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
@@ -34,7 +34,7 @@ Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner d
 
 
 ## Lizenz
-(Stand: 13.11.2024)
+(Stand: 16.11.2024)
 
 ```
 Copyright (c) D3 Data Development (Inh. Thomas Dartsch)

composer.json

@@ -6,7 +6,9 @@
     "oxid",
     "modules",
     "eShop",
-    "d3"
+    "d3",
+    "manufacturer",
+    "information"
   ],
   "authors": [
     {
@@ -24,28 +26,12 @@
 	"proprietary"
   ],
   "require": {
-    "php": "~7.0 || ~8.0",
+    "php": "^8.0",
-    "oxid-esales/oxideshop-ce": "v6.6.0 - v6.14.3"
+    "oxid-esales/oxideshop-ce": "7.0 - 7.1"
-  },
-  "require-dev": {
-    "phpunit/phpunit" : "^9.5",
-    "friendsofphp/php-cs-fixer": "^3.9",
-    "phpstan/phpstan": "^1.8"
-  },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json",
-        ".php-cs-fixer.php",
-        "*.neon"
-      ],
-      "target-directory": "d3/manufacturerinformation"
-    }
   },
   "autoload": {
     "psr-4": {
-      "D3\\ManufacturerInformation\\": "../../../source/modules/d3/manufacturerinformation"
+      "D3\\ManufacturerInformation\\": ""
     }
   }
 }

metadata.php

@@ -12,7 +12,7 @@
  */
 
 declare(strict_types=1);
-	
+
 use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
 use D3\ManufacturerInformation\Application\Model\Constants;
 use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
@@ -22,22 +22,22 @@ use OxidEsales\Eshop\Application\Model\ManufacturerList as OEManufacturerList;
 
 $sMetadataVersion = '2.1';
 
-$sModuleId = Constants::OXID_MODULE_ID;
-$logo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em">';
-
 /**
  * Module information
  */
 $aModule = [
-    'id'          => $sModuleId,
+    'id'          => Constants::OXID_MODULE_ID,
-    'title'       => $logo.' Herstellerinformationen',
+	'title'         => [
-    'description' => [
+		'de'        => '(D3) Herstellerinformationen',
+		'en'        => '(D3) Manufacturer information',
+	],
+	'description' => [
         'de' => 'fügt Informationen der Hersteller zur Artikelliste hinzu',
         'en' => 'adds manufacturer information to the article list',
     ],
     'thumbnail'   => 'image-file.png',
-    'version'     => '1.1.0.0',
+    'version'     => '2.0.0.0',
-    'author'      => $logo.' Data Development (Inh.: Thomas Dartsch)',
+    'author'      => '(D3) Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'controllers' => [
@@ -48,6 +48,6 @@ $aModule = [
 	    OEManufacturerList::class => ManufacturerInfoList::class
     ],
     'templates'   => [
-	    'd3manufacturerlongdesc.tpl'        => 'd3/manufacturerinformation/Application/views/admin/tpl/d3manufacturer_longdesc.tpl',
+	    '@' . Constants::OXID_MODULE_ID . '/admin/d3manufacturerlongdesc.tpl'        => 'views/smarty/admin/d3manufacturerlongdesc.tpl',
     ],
 ];

migration/migrations.yml

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

views/twig/admin/d3manufacturerlongdesc.html.twig

@@ -0,0 +1,41 @@
+{% include "headitem.html.twig" with {title: "GENERAL_ADMIN_TITLE"|translate} %}
+
+<script type="text/javascript">
+    function loadLang(obj)
+    {
+        var langvar = document.getElementById("catlang");
+        if (langvar != null )
+            langvar.value = obj.value;
+        document.myedit.submit();
+    }
+</script>
+
+{% if readonly %}
+    {% set readonly = "readonly disabled" %}
+    {% else %}
+    {% set readonly = "" %}
+    {% endif %}
+
+<form name="transfer" id="transfer" action="{{ oViewConf.getSelfLink() }}" method="post">
+    {{ oViewConf.getHiddenSid()|raw }}
+    <input type="hidden" name="oxid" value="{{ oxid }}">
+    <input type="hidden" name="cl" value="d3manufacturerinfolongdesc">
+    <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;">
+    {{ oViewConf.getHiddenSid()|raw }}
+    <input type="hidden" name="cl" value="d3manufacturerinfolongdesc">
+    <input type="hidden" name="fnc" value="">
+    <input type="hidden" name="oxid" value="{{ oxid }}">
+    <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="">
+
+    {% include "include/category_text_editor.html.twig" %}
+</form>
+
+{% include "bottomnaviitem.html.twig" %}
+
+{% include "bottomitem.html.twig" %}

views/twig/extensions/themes/default/page/list/list.html.twig

@@ -0,0 +1,126 @@
+{% extends "page/list/list.html.twig" %}
+
+{% block page_list_listhead %}
+    {% if listType=='manufacturer' or listType=='vendor'%}
+        <div class="bg-white list-header mb-4">
+            <div class="container-xxl">
+                <div class="row">
+                    <div class="col-12{% if actCategory.getIconUrl() %} col-md-6 order-2 order-md-1 {% endif %}">
+                        {% if showPopBreadcrump %}
+                            <div class="row">
+                                {% include "widget/breadcrumb.html.twig" %}
+                            </div>
+                        {% endif %}
+
+                        <h1{% if actCategory.oxcategories__oxthumb.value and actCategory.getThumbUrl() %} class="text-white"{% endif %}>
+                            {{ actCategory.getTitle() }}
+                        </h1>
+                        {% if actCategory and actCategory.getShortDescription() and oPageNavigation.actPage == 1 %}
+                            <div id="catDescLocator" class="categoryDescription pb-5">
+                                {{ actCategory.getShortDescription()|raw() }}
+                            </div>
+                        {% endif %}
+
+                        {% if actCategory.oxcategories__oxlongdesc.value and oPageNavigation.actPage == 1 %}
+                            {% block d3_page_list_long_desc %}
+                                <div id="d3catLongDescLocator" class="categoryDescription">
+                                    {{ include(template_from_string(actCategory.oxcategories__oxlongdesc)) }}
+                                </div>
+                            {% endblock %}
+                        {% endif %}
+                    </div>
+                    {% if actCategory.getIconUrl() %}
+                        <div class="col-12 col-md-6 order-1 order-md-1 py-4">
+                            <img src="{{ actCategory.getIconUrl()|raw }}" alt="{{ translate({ ident: "MANUFACTURER_IMAGE_ALT", args: actCategory.getTitle() }) }}">
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    {% else %}
+        <div class="bg-white list-header mb-4">
+            <div class="container-xxl">
+                <div class="row">
+                    <div class="col-12{% if actCategory.oxcategories__oxthumb.value and actCategory.getThumbUrl() %} col-md-6 order-2 order-md-1 {% endif %}">
+                        {% if showPopBreadcrump %}
+                            <div class="row">
+                                {% include "widget/breadcrumb.html.twig" %}
+                            </div>
+                        {% endif %}
+
+                        <h1 class="h2">
+                            {{ oView.getTitle() }}
+                        </h1>
+
+                        {% if actCategory and actCategory.getShortDescription() and oPageNavigation.actPage == 1 %}
+                            <div id="catDescLocator" class="categoryDescription pb-3">
+                                {{ actCategory.getShortDescription()|raw() }}
+                            </div>
+                        {% endif %}
+
+                        {% if actCategory.oxcategories__oxlongdesc.value and oPageNavigation.actPage == 1 %}
+                            {% block page_list_long_desc %}
+                                <div id="catLongDescLocator" class="categoryDescription">
+                                    {{ include(template_from_string(actCategory.oxcategories__oxlongdesc)) }}
+                                </div>
+                            {% endblock %}
+                        {% endif %}
+                    </div>
+                    {% if actCategory.oxcategories__oxthumb.value and actCategory.getThumbUrl() %}
+                        <div class="col-12 col-md-6 order-1 order-md-1 py-4 text-right">
+                            <img src="{{ actCategory.getThumbUrl()|raw }}" alt="{{ translate({ ident: "CATEGORY_IMAGE_ALT", args: actCategory.oxcategories__oxtitle.value }) }}" class="w-100 img-fluid">
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    {% endif %}
+    {% if oView.hasVisibleSubCats() %}
+        <div class="container-xxl">
+            {% set iSubCategoriesCount = 0 %}
+            <div class="cat-list mb-4 pb-3">
+                {% for category in oView.getSubCatList() %}
+                    {% if category.getIsVisible() %}
+                        {% set iSubCategoriesCount = iSubCategoriesCount+1 %}
+                        {% set iconUrl = category.getIconUrl() %}
+                        {% if listType=='manufacturer' or listType=='vendor' %}
+                            {% set iconAltAttribute = translate({ ident: "MANUFACTURER_IMAGE_ALT", args: category.oxcategories__oxtitle.value }) %}
+                        {% else %}
+                            {% set iconAltAttribute = translate({ ident: "CATEGORY_IMAGE_ALT", args: category.oxcategories__oxtitle.value }) %}
+                        {% endif %}
+                        <a href="{{ category.getLink()|raw }}" class="cat-list-item">
+                            {% if iconUrl %}
+                                <img loading="lazy" src="{{ category.getIconUrl()|raw }}" alt="{{ iconAltAttribute }}" class="cat-list-item-img">
+                            {% else %}
+                                <img loading="lazy" src="{{ oViewConf.getImageUrl('subcat-placeholder.png')|raw }}" alt="{{ iconAltAttribute }}" class="cat-list-item-img">
+                            {% endif %}
+                            <span class="cat-list-item-name">
+                                        {{ category.oxcategories__oxtitle.value }}
+
+                                {% if oView.showCategoryArticlesCount() and (category.getNrOfArticles() > 0) %}
+                                    <span class="text-muted">({{ category.getNrOfArticles() }})</span>
+                                {% endif %}
+                                    </span>
+                        </a>
+                    {% endif %}
+
+                    {% if category.getContentCats() %}
+                        {% for ocont in category.getContentCats() %}
+                            <a href="{{ ocont.getLink()|raw }}" class="cat-list-item">
+                                {% if listType=='manufacturer' or listType=='vendor' %}
+                                    {% set iconAltAttribute = translate({ ident: "MANUFACTURER_IMAGE_ALT", args: category.oxcategories__oxtitle.value }) %}
+                                {% else %}
+                                    {% set iconAltAttribute = translate({ ident: "CATEGORY_IMAGE_ALT", args: category.oxcategories__oxtitle.value }) %}
+                                {% endif %}
+                                <img loading="lazy" src="{{ oViewConf.getImageUrl('subcat-placeholder.png')|raw }}" alt="{{ iconAltAttribute }}" class="cat-list-item-img">
+                                <span class="cat-list-item-name">
+                                        {{ ocont.oxcontents__oxtitle.value }}
+                                    </span>
+                            </a>
+                        {% endfor %}
+                    {% endif %}
+                {% endfor %}
+            </div>
+        </div>
+    {% endif %}
+{% endblock %}