D3Public/manufacturer-information
8
0
Fork 0
Code Pull Requests Actions Packages Projects Releases 2 Activity

[Changed] extension of Config instead of ArticleDetails; [Fixed] wrong usage of modSetting getter

Browse Source 
more general, global take
This commit is contained in:
MaxBuhe01 2024-11-22 21:59:34 +01:00
parent eb489933c9
commit ef5f4039d0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IntelliSenseHelper.php
View File

@ -27,11 +27,11 @@ namespace D3\ManufacturerInformation\Modules\Application\Model{
} }
} }
namespace D3\ManufacturerInformation\Modules\Application\Component\Widgets{ namespace D3\ManufacturerInformation\Modules\Core{
use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails; use OxidEsales\Eshop\Core\Config;
class ArticleDetailsManufacturer_parent extends ArticleDetails class ManufacturerConfig_parent extends Config
{ {
} }
} }

2
Modules/Application/Model/ManufacturerInfoList.php
View File

@ -33,7 +33,7 @@ class ManufacturerInfoList extends ManufacturerInfoList_parent
{ {
parent::addCategoryFields($oManufacturer); parent::addCategoryFields($oManufacturer);
if (Registry::getConfig()->getConfigParam('d3manufacturerinformation_showManufacturertextOnManufacturerPage')) { if (Registry::getConfig()->d3GetBoolModuleSettingByName('_showManufacturertextOnManufacturerPage')) {
$oManufacturer->oxcategories__oxlongdesc = new Field( $oManufacturer->oxcategories__oxlongdesc = new Field(
html_entity_decode( html_entity_decode(
$oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME) ?? '' $oManufacturer->getFieldData(Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME) ?? ''

4
Modules/Application/Component/Widgets/ArticleDetailsManufacturer.php → Modules/Core/ManufacturerConfig.php
View File

@ -15,13 +15,13 @@
declare(strict_types=1); declare(strict_types=1);
namespace D3\ManufacturerInformation\Modules\Application\Component\Widgets; namespace D3\ManufacturerInformation\Modules\Core;
use D3\ManufacturerInformation\Application\Model\Constants; use D3\ManufacturerInformation\Application\Model\Constants;
use OxidEsales\EshopCommunity\Core\Di\ContainerFacade; use OxidEsales\EshopCommunity\Core\Di\ContainerFacade;
use OxidEsales\EshopCommunity\Internal\Framework\Module\Facade\ModuleSettingServiceInterface; use OxidEsales\EshopCommunity\Internal\Framework\Module\Facade\ModuleSettingServiceInterface;
class ArticleDetailsManufacturer extends ArticleDetailsManufacturer_parent class ManufacturerConfig extends ManufacturerConfig_parent
{ {
/** /**
* @param string $sName * @param string $sName

6
metadata.php
View File

@ -17,12 +17,12 @@ declare(strict_types=1);
use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc; use D3\ManufacturerInformation\Application\Controller\Admin\ManufacturerInfoLongdesc;
use D3\ManufacturerInformation\Application\Model\Constants; use D3\ManufacturerInformation\Application\Model\Constants;
use D3\ManufacturerInformation\Modules\Application\Component\Widgets\ArticleDetailsManufacturer;
use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc; use D3\ManufacturerInformation\Modules\Application\Model\D3ManufacturerLongDesc;
use D3\ManufacturerInformation\Modules\Application\Model\ManufacturerInfoList; use D3\ManufacturerInformation\Modules\Application\Model\ManufacturerInfoList;
use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails as OEArticleDetails; use D3\ManufacturerInformation\Modules\Core\ManufacturerConfig;
use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer; use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer;
use OxidEsales\Eshop\Application\Model\ManufacturerList as OEManufacturerList; use OxidEsales\Eshop\Application\Model\ManufacturerList as OEManufacturerList;
use OxidEsales\Eshop\Core\Config as OEConfig;
$sMetadataVersion = '2.1'; $sMetadataVersion = '2.1';
$sModuleId = Constants::OXID_MODULE_ID; $sModuleId = Constants::OXID_MODULE_ID;
@ -50,7 +50,7 @@ $aModule = [
'extend' => [ 'extend' => [
OEManufacturer::class => D3ManufacturerLongDesc::class, OEManufacturer::class => D3ManufacturerLongDesc::class,
OEManufacturerList::class => ManufacturerInfoList::class, OEManufacturerList::class => ManufacturerInfoList::class,
OEArticleDetails::class => ArticleDetailsManufacturer::class, OEConfig::class => ManufacturerConfig::class,
], ],
'templates' => [ 'templates' => [
'@' . Constants::OXID_MODULE_ID . '/admin/d3manufacturerlongdesc.tpl' => 'views/smarty/admin/d3manufacturerlongdesc.tpl', '@' . Constants::OXID_MODULE_ID . '/admin/d3manufacturerlongdesc.tpl' => 'views/smarty/admin/d3manufacturerlongdesc.tpl',

2
views/twig/extensions/themes/default/page/details/inc/accordeon.html.twig
View File

@ -7,7 +7,7 @@
{% set sShopURL = config.getConfigParam('sShopURL') %} {% set sShopURL = config.getConfigParam('sShopURL') %}
{% set description = oManufacturer.d3GetLongdesc() %} {% set description = oManufacturer.d3GetLongdesc() %}
{% if oManufacturer and oView.d3GetBoolModuleSettingByName('_showManufacturertextOnDetailsPage') and description|striptags|trim %} {% if oManufacturer and config.d3GetBoolModuleSettingByName('_showManufacturertextOnDetailsPage') and description|striptags|trim %}
<div class="col-12 col-md-6"> <div class="col-12 col-md-6">
<div id="manufacturer-collapsible" class="h4" data-bs-target="#manufacturer" data-bs-toggle="collapse" role="button" aria-expanded="false" aria-controls="manufacturer"> <div id="manufacturer-collapsible" class="h4" data-bs-target="#manufacturer" data-bs-toggle="collapse" role="button" aria-expanded="false" aria-controls="manufacturer">
{{ translate({ ident: "D3_MANUFACTURERINFO_TAB" }) }} {{ translate({ ident: "D3_MANUFACTURERINFO_TAB" }) }}