8 Commits

Author SHA1 Message Date
563741bc86 update version information
# Conflicts:
#	CHANGELOG.md
#	metadata.php
2024-12-05 12:56:46 +01:00
38fa707dea parse manufacturer longdesc through Smarty 2024-12-05 12:56:45 +01:00
39b24479fd generate field long name by shop method, assert return type 2024-12-05 12:56:45 +01:00
4e8a02fba1 remove unused assignment 2024-12-05 12:56:45 +01:00
0d05a3ec49 [Changed] longdesc-textinput-window bottom padding 2024-12-03 16:34:50 +01:00
9b119fb3fb update version information
# Conflicts:
#	CHANGELOG.md
#	metadata.php
2024-11-26 11:18:08 +01:00
ffa41bcd50 update README
# Conflicts:
#	README.md
#	migration/data/Version20241023154223.php
#	migration/data/Version20241028172608.php
2024-11-26 11:16:37 +01:00
04de2369e6 rename incorrect language files by mistake ¯\(°_o)/¯ 2024-11-26 11:15:09 +01:00
9 changed files with 39 additions and 14 deletions

View File

@ -103,7 +103,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
*/
public function d3GetLongdescParamValue(): string
{
return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
return (string) Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
}
/**

View File

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

View File

@ -4,7 +4,19 @@ 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/D3Private/manufacturer-information/compare/1.0.3.0...rel_1.x)
## [unreleased](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.4.0...rel_1.x)
## [1.0.4.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.3.1...1.0.4.0) - 2024-12-05
### Added
- longdesc will parsed by Smarty
## [1.0.3.1](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.3.0...1.0.3.1) - 2024-11-26
### Fixed
- rename language files
### Changed
- switch to open source
## [1.0.3.0](https://git.d3data.de/D3Private/manufacturer-information/compare/1.0.2.1...1.0.3.0) - 2024-11-22
### Fixed

View File

@ -47,7 +47,7 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
*/
public function d3GetLongdesc(): Field
{
$longName = $this->getCoreTableName().'__'.strtolower(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
return $this->$longName;
$longName = $this->_getFieldLongName(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME);
return $this->$longName ?: oxNew(Field::class);
}
}

View File

@ -34,12 +34,22 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent
parent::_addCategoryFields($oManufacturer);
if (Registry::getConfig()->getConfigParam('d3manufacturerinformation_showManufacturertextOnManufacturerPage')) {
$oManufacturer->oxcategories__oxlongdesc = new Field(
html_entity_decode(
$oManufacturer->getFieldData( Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME ) ?? ''
),
Field::T_RAW
);
/** @var \OxidEsales\Eshop\Core\UtilsView $oUtilsView */
$oUtilsView = Registry::getUtilsView();
$longdesc = $oManufacturer->d3GetLongdesc()->getRawValue() ?? '';
$deactivateSmarty = Registry::getConfig()->getConfigParam('deactivateSmartyForCmsContent');
$processLongDescriptions = Registry::getConfig()->getConfigParam('bl_perfParseLongDescinSmarty');
if (!$deactivateSmarty && $processLongDescriptions) {
$longdesc = $oUtilsView->parseThroughSmarty(
$longdesc,
$oManufacturer->getId() . $oManufacturer->getLanguage(),
null,
true
) ?? '';
}
$oManufacturer->oxcategories__oxlongdesc = new Field(html_entity_decode($longdesc), Field::T_RAW);
}
}
}

View File

@ -2,8 +2,10 @@
# ![D3 Logo](https://logos.oxidmodule.com/d3logo_24x24.svg) Herstellerinformationen für OXID eShop
Dieses Modul fügt Ihren Herstellereinstellungen einen Tab zur
detaillierten Beschreibung Ihrer Hersteller hinzu.
Fügt die Möglichkeit zur Langtextbeschreibung den Herstellern hinzu. Die Anzeige der Informationen erfolgt einstellbar auf der Herstellerübersicht und/oder als Infotab an den Artikeln der Herstellers.
**Diese Software wird unter einer kommerziellen Lizenz vertrieben.**
Kontaktieren Sie uns für eine Nutzungslizenz vor der Installation.
## Inhaltsverzeichnis
@ -17,6 +19,7 @@ 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 config repositories.d3manufacturerinformation vcs https://git.d3data.de/D3Public/manufacturer-information.git
composer require d3/manufacturerinformation:"~1.0.0"
```

View File

@ -39,7 +39,7 @@ $aModule = [
'en' => 'adds manufacturer information to the article list',
],
'thumbnail' => 'picture.svg',
'version' => '1.0.3.0',
'version' => '1.0.4.0',
'author' => $logo.' Data Development (Inh.: Thomas Dartsch)',
'email' => 'support@shopmodule.com',
'url' => 'https://www.oxidmodule.com/',