Vergelijk commits
3 Commits
Auteur | SHA1 | Datum | |
---|---|---|---|
ea935ce882 | |||
490792894c | |||
a5f245be9b |
@ -98,26 +98,6 @@ 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
|
* @return string
|
||||||
*/
|
*/
|
||||||
|
@ -1,16 +1,18 @@
|
|||||||
[{$smarty.block.parent}]
|
[{$smarty.block.parent}]
|
||||||
|
|
||||||
[{assign var="oConfig" value=$oViewConf->getConfig()}]
|
|
||||||
[{assign var="oManufacturer" value=$oView->getManufacturer()}]
|
[{assign var="oManufacturer" value=$oView->getManufacturer()}]
|
||||||
[{assign var="sShopURL" value=$oConfig->getConfigParam('sShopURL')}]
|
[{if $oManufacturer && $oManufacturer->getId()}]
|
||||||
[{assign var="description" value=$oManufacturer->d3GetLongdesc()}]
|
[{assign var="oConfig" value=$oViewConf->getConfig()}]
|
||||||
|
[{assign var="sShopURL" value=$oConfig->getConfigParam('sShopURL')}]
|
||||||
|
[{assign var="description" value=$oManufacturer->d3GetLongdesc()}]
|
||||||
|
|
||||||
[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->rawValue|strip_tags|trim}]
|
[{if $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->rawValue|strip_tags|trim}]
|
||||||
[{capture append="tabs"}]<a href="#manufacturertab" data-toggle="tab">[{oxmultilang ident="MANUFACTURER"}]</a>[{/capture}]
|
[{capture append="tabs"}]<a href="#manufacturertab" class="nav-link[{if $blFirstTab}] active[{/if}]" 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}]
|
[{/if}]
|
@ -4,7 +4,12 @@ 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/),
|
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).
|
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.0...rel_1.x)
|
## [unreleased](https://git.d3data.de/D3Public/MyModule/compare/1.0.2.1...rel_1.x)
|
||||||
|
|
||||||
|
## [1.0.2.1](https://git.d3data.de/D3Public/MyModule/compare/1.0.2.0...1.0.2.1) - 2024-11-21
|
||||||
|
### 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
|
## [1.0.2.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.1.0...1.0.2.0) - 2024-11-19
|
||||||
### Fixed
|
### Fixed
|
||||||
|
@ -16,7 +16,6 @@ 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.
|
Ö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
|
```bash
|
||||||
composer require d3/manufacturerinformation:"~1.0.0"
|
composer require d3/manufacturerinformation:"~1.0.0"
|
||||||
```
|
```
|
||||||
@ -27,7 +26,6 @@ Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
|
|||||||
|
|
||||||
Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner des Shops.
|
Aktualisieren Sie anschließend die Datenbank-Views und leeren den Temp Ordner des Shops.
|
||||||
|
|
||||||
|
|
||||||
## Lizenz
|
## Lizenz
|
||||||
(Stand: 13.11.2024)
|
(Stand: 13.11.2024)
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ $aModule = [
|
|||||||
'en' => 'adds manufacturer information to the article list',
|
'en' => 'adds manufacturer information to the article list',
|
||||||
],
|
],
|
||||||
'thumbnail' => 'image-file.png',
|
'thumbnail' => 'image-file.png',
|
||||||
'version' => '1.0.2.0',
|
'version' => '1.0.2.1',
|
||||||
'author' => $logo.' Data Development (Inh.: Thomas Dartsch)',
|
'author' => $logo.' Data Development (Inh.: Thomas Dartsch)',
|
||||||
'email' => 'support@shopmodule.com',
|
'email' => 'support@shopmodule.com',
|
||||||
'url' => 'https://www.oxidmodule.com/',
|
'url' => 'https://www.oxidmodule.com/',
|
||||||
|
Verwijs in nieuw issue
Block a user