Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
1cb629cc67 | |||
e533b349fe | |||
117cce87bd | |||
a95a1ab768 | |||
814ea3c193 | |||
547d3ab1dd | |||
0600d16fc6 |
1
.noencode
Normal file
1
.noencode
Normal file
@ -0,0 +1 @@
|
|||||||
|
copyAsIsFiles=metadata.php, .php-cs-fixer.php, IntelliSenseHelper.php, migration, Application/views
|
34
.php-cs-fixer.php
Normal file
34
.php-cs-fixer.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
$finder = PhpCsFixer\Finder::create()
|
||||||
|
->in(__DIR__)
|
||||||
|
;
|
||||||
|
|
||||||
|
$header = <<<EOF
|
||||||
|
Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
|
||||||
|
For the full copyright and license information, please view
|
||||||
|
the LICENSE file that was distributed with this source code.
|
||||||
|
|
||||||
|
https://www.d3data.de
|
||||||
|
|
||||||
|
@copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
@author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
@link https://www.oxidmodule.com
|
||||||
|
EOF;
|
||||||
|
|
||||||
|
$config = new PhpCsFixer\Config();
|
||||||
|
return $config->setRules([
|
||||||
|
'@PHP80Migration' => true,
|
||||||
|
'@PSR12' => true,
|
||||||
|
'header_comment' => [
|
||||||
|
'comment_type' => 'PHPDoc',
|
||||||
|
'header' => $header,
|
||||||
|
'location' => 'after_open',
|
||||||
|
'separate' => 'both',
|
||||||
|
],
|
||||||
|
'php_unit_test_class_requires_covers' => true,
|
||||||
|
'doctrine_annotation_indentation' => true,
|
||||||
|
])
|
||||||
|
->setFinder($finder)
|
||||||
|
;
|
@ -1,5 +1,18 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* https://www.d3data.de
|
||||||
|
*
|
||||||
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
* @link https://www.oxidmodule.com
|
||||||
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace D3\ManufacturerInformation\Application\Controller\Admin;
|
namespace D3\ManufacturerInformation\Application\Controller\Admin;
|
||||||
@ -108,7 +121,7 @@ class ManufacturerInfoLongdesc extends AdminDetailsController
|
|||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function d3GetLongdescParamValue() :string
|
public function d3GetLongdescParamValue(): string
|
||||||
{
|
{
|
||||||
return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
|
return (string) $aParams = Registry::getRequest()->getRequestEscapedParameter("editval")['oxmanufacturers__d3description'];
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,22 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* https://www.d3data.de
|
||||||
|
*
|
||||||
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
* @link https://www.oxidmodule.com
|
||||||
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace D3\ManufacturerInformation\Application\Model;
|
namespace D3\ManufacturerInformation\Application\Model;
|
||||||
|
|
||||||
|
|
||||||
class Constants
|
class Constants
|
||||||
{
|
{
|
||||||
public const OXID_MODULE_ID = 'd3manufacturerinformation';
|
public const OXID_MODULE_ID = 'd3manufacturerinformation';
|
||||||
|
@ -1,13 +1,26 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* https://www.d3data.de
|
||||||
|
*
|
||||||
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
* @link https://www.oxidmodule.com
|
||||||
|
*/
|
||||||
|
|
||||||
$sLangName = "Deutsch";
|
$sLangName = "Deutsch";
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
// RESOURCE IDENTITFIER = STRING
|
// RESOURCE IDENTITFIER = STRING
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
$aLang = array(
|
$aLang = [
|
||||||
'charset' => 'UTF-8',
|
'charset' => 'UTF-8',
|
||||||
|
|
||||||
'mxd3manufacturerinfolongdesc' => 'Langtext',
|
'mxd3manufacturerinfolongdesc' => 'Langtext',
|
||||||
'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen',
|
'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Einstellungen',
|
||||||
'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen'
|
'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'vorhandene Herstellertexte auf Artikeldetails als Tab anzeigen',
|
||||||
);
|
];
|
||||||
|
@ -1,13 +1,26 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* https://www.d3data.de
|
||||||
|
*
|
||||||
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
* @link https://www.oxidmodule.com
|
||||||
|
*/
|
||||||
|
|
||||||
$sLangName = "Deutsch";
|
$sLangName = "Deutsch";
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
// RESOURCE IDENTITFIER = STRING
|
// RESOURCE IDENTITFIER = STRING
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
$aLang = array(
|
$aLang = [
|
||||||
'charset' => 'UTF-8',
|
'charset' => 'UTF-8',
|
||||||
|
|
||||||
'mxd3manufacturerinfolongdesc' => 'Text',
|
'mxd3manufacturerinfolongdesc' => 'Text',
|
||||||
'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings',
|
'SHOP_MODULE_GROUP_d3manufacturerinformation_main' => 'Settings',
|
||||||
'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'display existing manufacturer texts on item details as a tab'
|
'SHOP_MODULE_d3manufacturerinformation_showManufacturertextOnDetailsPage' => 'display existing manufacturer texts on item details as a tab',
|
||||||
);
|
];
|
||||||
|
@ -35,7 +35,9 @@
|
|||||||
<input type="hidden" name="catlang" value="[{$catlang}]">
|
<input type="hidden" name="catlang" value="[{$catlang}]">
|
||||||
<input type="hidden" name="editval[oxmanufacturers__d3description]" value="">
|
<input type="hidden" name="editval[oxmanufacturers__d3description]" value="">
|
||||||
|
|
||||||
|
<div style="margin-bottom: 40px">
|
||||||
[{include file="include/category_text_editor.tpl"}]
|
[{include file="include/category_text_editor.tpl"}]
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
[{include file="bottomnaviitem.tpl"}]
|
[{include file="bottomnaviitem.tpl"}]
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
[{assign var="sShopURL" value=$oConfig->getConfigParam('sShopURL')}]
|
[{assign var="sShopURL" value=$oConfig->getConfigParam('sShopURL')}]
|
||||||
[{assign var="description" value=$oManufacturer->d3GetLongdesc()}]
|
[{assign var="description" value=$oManufacturer->d3GetLongdesc()}]
|
||||||
|
|
||||||
[{if $oManufacturer && $oConfig->getConfigParam('d3manufacturerinformation_showManufacturertextOnDetailsPage') && $description->value}]
|
[{if $oManufacturer && $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" 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}]">
|
||||||
|
@ -4,7 +4,14 @@ 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.1.0...rel_1.x)
|
## [unreleased](https://git.d3data.de/D3Public/MyModule/compare/1.0.2.0...rel_1.x)
|
||||||
|
|
||||||
|
## [1.0.2.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.1.0...1.0.2.0) - 2024-11-19
|
||||||
|
### Fixed
|
||||||
|
- show hidden save button
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- hide empty HTML elements content
|
||||||
|
|
||||||
## [1.0.1.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.0.1.0) - 2024-11-18
|
## [1.0.1.0](https://git.d3data.de/D3Public/MyModule/compare/1.0.0.0...1.0.1.0) - 2024-11-18
|
||||||
### Fixed
|
### Fixed
|
||||||
|
@ -1,21 +1,23 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This Software is the property of Data Development and is protected
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
* by copyright law - it is NOT Freeware.
|
*
|
||||||
* Any unauthorized use of this software without a valid license
|
* For the full copyright and license information, please view
|
||||||
* is a violation of the license agreement and will be prosecuted by
|
* the LICENSE file that was distributed with this source code.
|
||||||
* civil and criminal law.
|
*
|
||||||
* http://www.shopmodule.com
|
* https://www.d3data.de
|
||||||
*
|
*
|
||||||
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
* @author D3 Data Development - Daniel Seifert <support@shopmodule.com>
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
* @link http://www.oxidmodule.com
|
* @link https://www.oxidmodule.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace D3\ManufacturerInformation\Modules\Application\Model{
|
namespace D3\ManufacturerInformation\Modules\Application\Model{
|
||||||
|
|
||||||
use OxidEsales\Eshop\Application\Model\Manufacturer;
|
use OxidEsales\Eshop\Application\Model\Manufacturer;
|
||||||
|
|
||||||
class D3ManufacturerLongDesc_parent extends Manufacturer {}
|
class D3ManufacturerLongDesc_parent extends Manufacturer
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
@ -1,10 +1,22 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* https://www.d3data.de
|
||||||
|
*
|
||||||
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
* @link https://www.oxidmodule.com
|
||||||
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace D3\ManufacturerInformation\Modules\Application\Model;
|
namespace D3\ManufacturerInformation\Modules\Application\Model;
|
||||||
|
|
||||||
|
|
||||||
use D3\ManufacturerInformation\Application\Model\Constants;
|
use D3\ManufacturerInformation\Application\Model\Constants;
|
||||||
use OxidEsales\Eshop\Application\Model\Manufacturer;
|
use OxidEsales\Eshop\Application\Model\Manufacturer;
|
||||||
use OxidEsales\Eshop\Core\Field;
|
use OxidEsales\Eshop\Core\Field;
|
||||||
@ -16,13 +28,13 @@ class D3ManufacturerLongDesc extends D3ManufacturerLongDesc_parent
|
|||||||
* @param string $sValue
|
* @param string $sValue
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function d3SetLongdesc(string $sValue) :bool
|
public function d3SetLongdesc(string $sValue): bool
|
||||||
{
|
{
|
||||||
if ($this->getId() and $this->isLoaded()){
|
if ($this->getId() and $this->isLoaded()) {
|
||||||
try {
|
try {
|
||||||
$this->assign([Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME => $sValue]);
|
$this->assign([Constants::D3_OXMANUFACTURERS_LONGDESC_FIELDNAME => $sValue]);
|
||||||
$this->save();
|
$this->save();
|
||||||
}catch (\Exception $exception){
|
} catch (\Exception $exception) {
|
||||||
Registry::getLogger()->error($exception->getMessage());
|
Registry::getLogger()->error($exception->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,22 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
|
*
|
||||||
|
* https://www.d3data.de
|
||||||
|
*
|
||||||
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
|
* @link https://www.oxidmodule.com
|
||||||
|
*/
|
||||||
|
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
namespace D3\ManufacturerInformation\Modules\Application\Model;
|
namespace D3\ManufacturerInformation\Modules\Application\Model;
|
||||||
|
|
||||||
|
|
||||||
use D3\ManufacturerInformation\Application\Model\Constants;
|
use D3\ManufacturerInformation\Application\Model\Constants;
|
||||||
use OxidEsales\Eshop\Application\Model\Manufacturer;
|
use OxidEsales\Eshop\Application\Model\Manufacturer;
|
||||||
use OxidEsales\Eshop\Application\Model\ManufacturerList;
|
use OxidEsales\Eshop\Application\Model\ManufacturerList;
|
||||||
|
@ -18,7 +18,7 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
|
|||||||
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
composer require d3/manufacturerinformation:"~1.0"
|
composer require d3/manufacturerinformation:"~1.0.0"
|
||||||
```
|
```
|
||||||
|
|
||||||
Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
|
Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
|
||||||
|
@ -27,11 +27,7 @@
|
|||||||
"php": ">=7.0",
|
"php": ">=7.0",
|
||||||
"oxid-esales/oxideshop-ce": "v6.0 - v6.5.6"
|
"oxid-esales/oxideshop-ce": "v6.0 - v6.5.6"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {},
|
||||||
"phpunit/phpunit" : "^9.5",
|
|
||||||
"friendsofphp/php-cs-fixer": "^3.9",
|
|
||||||
"phpstan/phpstan": "^1.8"
|
|
||||||
},
|
|
||||||
"extra": {
|
"extra": {
|
||||||
"oxideshop": {
|
"oxideshop": {
|
||||||
"blacklist-filter": [
|
"blacklist-filter": [
|
||||||
@ -47,5 +43,9 @@
|
|||||||
"psr-4": {
|
"psr-4": {
|
||||||
"D3\\ManufacturerInformation\\": "../../../source/modules/d3/manufacturerinformation"
|
"D3\\ManufacturerInformation\\": "../../../source/modules/d3/manufacturerinformation"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"php-cs-fixer_audit": "./vendor/bin/php-cs-fixer list-files --config=./vendor/d3/manufacturerinformation/.php-cs-fixer.php",
|
||||||
|
"php-cs-fixer_fix": "./vendor/bin/php-cs-fixer fix --config=./vendor/d3/manufacturerinformation/.php-cs-fixer.php"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
18
metadata.php
18
metadata.php
@ -1,13 +1,15 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For the full copyright and license information, please view the LICENSE
|
* Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
* file that was distributed with this source code.
|
*
|
||||||
|
* For the full copyright and license information, please view
|
||||||
|
* the LICENSE file that was distributed with this source code.
|
||||||
*
|
*
|
||||||
* https://www.d3data.de
|
* https://www.d3data.de
|
||||||
*
|
*
|
||||||
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
* @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
|
||||||
* @author D3 Data Development - Daniel Seifert <info@shopmodule.com>
|
* @author D3 Data Development - Max Buhe, Daniel Seifert <info@shopmodule.com>
|
||||||
* @link https://www.oxidmodule.com
|
* @link https://www.oxidmodule.com
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -37,16 +39,16 @@ $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.1.0',
|
'version' => '1.0.2.0',
|
||||||
'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/',
|
||||||
'controllers' => [
|
'controllers' => [
|
||||||
"d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class
|
"d3manufacturerinfolongdesc" => ManufacturerInfoLongdesc::class,
|
||||||
],
|
],
|
||||||
'extend' => [
|
'extend' => [
|
||||||
OEManufacturer::class => D3ManufacturerLongDesc::class,
|
OEManufacturer::class => D3ManufacturerLongDesc::class,
|
||||||
OEManufacturerList::class => ManufacturerInfoList::class
|
OEManufacturerList::class => ManufacturerInfoList::class,
|
||||||
],
|
],
|
||||||
'events' => [
|
'events' => [
|
||||||
'onActivate' => Events::class.'::activate',
|
'onActivate' => Events::class.'::activate',
|
||||||
@ -60,7 +62,7 @@ $aModule = [
|
|||||||
'group' => $sModuleId.'_main',
|
'group' => $sModuleId.'_main',
|
||||||
'name' => $sModuleId.'_showManufacturertextOnDetailsPage',
|
'name' => $sModuleId.'_showManufacturertextOnDetailsPage',
|
||||||
'type' => 'bool',
|
'type' => 'bool',
|
||||||
'value' => true
|
'value' => true,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
'blocks' => [
|
'blocks' => [
|
||||||
@ -74,5 +76,5 @@ $aModule = [
|
|||||||
'block' => 'details_tabs_invite',
|
'block' => 'details_tabs_invite',
|
||||||
'file' => 'Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl',
|
'file' => 'Application/views/blocks/page/details/inc/details_tabs_invite.html.tpl',
|
||||||
],
|
],
|
||||||
]
|
],
|
||||||
];
|
];
|
||||||
|
Reference in New Issue
Block a user