Commit 727e7094 authored by Dirk Wildt's avatar Dirk Wildt

9.0.0

parent b51817d7
...@@ -4,6 +4,59 @@ TODO ...@@ -4,6 +4,59 @@ TODO
* 161115: Bug in context with variants: In case of update the quantity by caddy, limits won't respected! * 161115: Bug in context with variants: In case of update the quantity by caddy, limits won't respected!
* jquery.t3caddy-4.0.0.js: possible lang is en and de only! * jquery.t3caddy-4.0.0.js: possible lang is en and de only!
9.0.0
19-07-15
Compatibility
* #i0302: TYPO3 9.5
* \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath -> \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath
* No extension key could be determined when calling addPlugin()!
8.17.9
19-06-04
Feature
* #t3776: Spanish
Affected files:
* Configuration/TypoScript
* Basis/Plugin/TxCaddyPi1
* _constants/tax.ts
* api/marker.ts
* htmlmarker
* caddy_bankaccount.ts
* caddy_buttonsubmit.ts
* caddy_ordernote.ts
* caddy_prompt_cashdiscount.ts
* caddy_prompt_order.ts
* pdf
* deliveryorder.ts
* revocation.ts
* terms.ts
* Bootstrap
* 3x/tx_caddy_pi1/setup.ts
* 4x/tx_caddy_pi1/setup.ts
* Browser/Export/162/tx_browser_pi1/marker.ts
* EPayment/paymill
* 4x/setup.txt
* 5x/setup.txt
* bootstrap
* 3x/setup.txt
* 4x/setup.txt
* Foundation
* 4x/setup.txt
* 5x/tx_caddy_pi1/setup.ts
* Resources/Private/Language/Plugins/pi1/locallang.xlf
New files:
* Resources/Private/Language
* FlexForms
* Pi1/es.locallang_flexform.xlf
* Pi2/es.locallang_flexform.xlf
* Pi3/es.locallang_flexform.xlf
* Plugins
* pi1/es.locallang.xlf
* pi2/es.locallang.xlf
* pi3/es.locallang.xlf
* es.Powermail.xlf
* es.locallang_db.xlf
8.17.8 8.17.8
19-05-30 19-05-30
Feature Feature
......
...@@ -616,6 +616,8 @@ class Session ...@@ -616,6 +616,8 @@ class Session
$pid = $this->getPid( $pid ); $pid = $this->getPid( $pid );
// #i0044, 140206, dwildt, 1+ // #i0044, 140206, dwildt, 1+
$sesArray = $GLOBALS[ 'TSFE' ]->fe_user->getKey( 'ses', $this->extKey . '_' . $pid ); $sesArray = $GLOBALS[ 'TSFE' ]->fe_user->getKey( 'ses', $this->extKey . '_' . $pid );
//var_dump(__METHOD__, __LINE__, $this->extKey . '_' . $pid);
//die();
// Overwrite products // Overwrite products
$sesArray[ 'products' ] = $currProducts; $sesArray[ 'products' ] = $currProducts;
......
...@@ -58,7 +58,7 @@ class Icons ...@@ -58,7 +58,7 @@ class Icons
*/ */
private function getClassWiIcons( ) private function getClassWiIcons( )
{ {
$extRelPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( 'caddy' ); $extRelPath = \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( 'caddy' );
return array( return array(
array( array(
'class' => 'contains-caddy', 'class' => 'contains-caddy',
......
...@@ -177,8 +177,8 @@ $path2Ts = 'Configuration/TypoScript/'; ...@@ -177,8 +177,8 @@ $path2Ts = 'Configuration/TypoScript/';
\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \Netzmacher\Caddy\Utility\TCA\Icons::class )->tcaPages(); \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \Netzmacher\Caddy\Utility\TCA\Icons::class )->tcaPages();
// $_EXTKEY = 'caddy'; // $_EXTKEY = 'caddy';
// $ext = 'gif'; // $ext = 'gif';
// $TCA[ 'pages' ][ 'columns' ][ 'module' ][ 'config' ][ 'items' ][] = array( 'Caddy', 'caddy', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.' . $ext ); // $TCA[ 'pages' ][ 'columns' ][ 'module' ][ 'config' ][ 'items' ][] = array( 'Caddy', 'caddy', \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.' . $ext );
// $TCA[ 'pages' ][ 'columns' ][ 'module' ][ 'config' ][ 'items' ][] = array( 'Caddy Mini', 'caddymini', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.' . $ext ); // $TCA[ 'pages' ][ 'columns' ][ 'module' ][ 'config' ][ 'items' ][] = array( 'Caddy Mini', 'caddymini', \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.' . $ext );
// \TYPO3\CMS\Backend\Sprite\SpriteManager::addTcaTypeIcon( 'pages', 'contains-caddy', '../typo3conf/ext/caddy/ext_icon.' . $ext ); // \TYPO3\CMS\Backend\Sprite\SpriteManager::addTcaTypeIcon( 'pages', 'contains-caddy', '../typo3conf/ext/caddy/ext_icon.' . $ext );
// \TYPO3\CMS\Backend\Sprite\SpriteManager::addTcaTypeIcon( 'pages', 'contains-caddymini', '../typo3conf/ext/caddy/ext_icon.' . $ext ); // \TYPO3\CMS\Backend\Sprite\SpriteManager::addTcaTypeIcon( 'pages', 'contains-caddymini', '../typo3conf/ext/caddy/ext_icon.' . $ext );
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
...@@ -199,7 +199,7 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi ...@@ -199,7 +199,7 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi1', 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi1',
$_EXTKEY . '_pi1', $_EXTKEY . '_pi1',
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif' \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif'
), 'list_type' ); ), 'list_type' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi1', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi1/flexform' . $pmVers . '.xml' ); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi1', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi1/flexform' . $pmVers . '.xml' );
...@@ -208,7 +208,7 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi ...@@ -208,7 +208,7 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi2', 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi2',
$_EXTKEY . '_pi2', $_EXTKEY . '_pi2',
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'Resources/Public/Images/caddy_000_13.png' \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'Resources/Public/Images/caddy_000_13.png'
), 'list_type' ); ), 'list_type' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi2', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi2/flexform.xml' ); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi2', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi2/flexform.xml' );
...@@ -217,7 +217,7 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi ...@@ -217,7 +217,7 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi3', 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi3',
$_EXTKEY . '_pi3', $_EXTKEY . '_pi3',
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif' \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif'
), 'list_type' ); ), 'list_type' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi3', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi3/flexform.xml' ); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi3', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi3/flexform.xml' );
// Plugin Configuration // Plugin Configuration
......
<?php
$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \TYPO3\CMS\Core\Imaging\IconRegistry::class );
$extIcon = array(
'identifier' => 'app-caddy'
, 'key' => 'caddy' // <- Key must be the part behind contain- of the identifier!
, 'label' => 'Caddy'
, 'source' => 'EXT:caddy/ext_icon.svg'
);
$iconRegistry->registerIcon(
$extIcon[ 'identifier' ]
, \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class
, [ 'source' => $extIcon[ 'source' ] ]
);
// 171207, dwildt, see SvgIconProvider, -
//$TCA[ 'pages' ][ 'columns' ][ 'module' ][ 'config' ][ 'items' ][] = array(
// $extIcon[ 'label' ]
// , $extIcon[ 'key' ]
// , $extIcon[ 'identifier' ]
//);
$TCA[ 'pages' ][ 'ctrl' ][ 'typeicon_classes' ][ $extIcon[ 'identifier' ] ] = $extIcon[ 'identifier' ];
\ No newline at end of file
<?php
if( !defined( 'TYPO3_MODE' ) )
{
die( 'Access denied.' );
}
$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \TYPO3\CMS\Core\Imaging\IconRegistry::class );
$extIconPath = 'EXT:caddy/Resources/Public/Icons/PageTree/';
$extIcons = array(
'caddy' => array(
'identifier' => 'contains-caddy'
, 'key' => 'caddy' // <- Key must be the part behind contains- of the identifier!
, 'label' => 'Caddy'
, 'source' => $extIconPath . 'caddy.svg'
),
);
foreach( ( array ) $extIcons as $extIcon )
{
$iconRegistry->registerIcon(
$extIcon[ 'identifier' ]
, \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class
, [ 'source' => $extIcon[ 'source' ] ]
);
$TCA[ 'pages' ][ 'columns' ][ 'module' ][ 'config' ][ 'items' ][] = array(
$extIcon[ 'label' ]
, $extIcon[ 'key' ]
, $extIcon[ 'identifier' ]
);
$TCA[ 'pages' ][ 'ctrl' ][ 'typeicon_classes' ][ $extIcon[ 'identifier' ] ] = $extIcon[ 'identifier' ];
}
\ No newline at end of file
<?php
if( !defined( 'TYPO3_MODE' ) )
{
$prompt = 'Access denied.<br />' . __FILE__ . ' (#' . __LINE__ . ')';
die( $prompt );
}
$confArr = unserialize( $GLOBALS[ 'TYPO3_CONF_VARS' ][ 'EXT' ][ 'extConf' ][ 'caddy' ] );
// Language for labels of static templates and page tsConfig
$beLanguage = $confArr[ 'beLanguage' ];
switch( $beLanguage )
{
case( 'German'):
$beLanguage = 'de';
break;
default:
$beLanguage = 'default';
}
// Language for labels of static templates and page tsConfig
// Configuration by the extension manager
////////////////////////////////////////////////////////////////////////////
//
// Enables the Include Static Templates
// Case $beLanguage
$path2Ts = 'Configuration/TypoScript/';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Basis/', 'Caddy [1.0.0] Basis' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Css/', 'Caddy [3.1.0] +CSS blue' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Css/orange/', 'Caddy [3.1.0] +CSS orange' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Css/green/', 'Caddy [3.1.0] +CSS green' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Css/red/', 'Caddy [3.1.0] +CSS red' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bootstrap/4x/', 'Caddy [3.2.0] +Bootstrap 4x' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bootstrap/4x/Css/', 'Caddy [3.2.1] +Bootstrap 4x CSS' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bootstrap/4x/tx_caddy_pi1/woOptionsWoFee/', 'Caddy [3.2.2] +Bootstrap 4x without Caddy options and costs' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bootstrap/3x/', 'Caddy [3.2.0] +Bootstrap 3x' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bootstrap/3x/Css/', 'Caddy [3.2.1] +Bootstrap 3x CSS' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bootstrap/3x/tx_caddy_pi1/woOptionsWoFee/', 'Caddy [3.2.2] +Bootstrap 3x without Caddy options and costs' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/5x/', 'Caddy [3.3.0] +Foundation' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/4x/', 'Caddy [3.3.0] +Foundation 4.x (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/5x/Css/', 'Caddy [3.3.1] +Foundation CSS' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/4x/Css/', 'Caddy [3.3.1] +Foundation 4.x CSS (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/5x/tx_caddy_pi1/woOptionsWoFee/', 'Caddy [3.3.2] +Foundation without Caddy options and costs' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/5x/Mini/Dropdown/', 'Caddy [3.3.3] +Foundation Minicaddy Dropdown' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Foundation/5x/Mini/Reveal/', 'Caddy [3.3.3] +Foundation Minicaddy Reveal' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Start/', 'Caddy [6.0.0] +Start: Minicaddy as modal' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/4x/', 'Caddy [7.0.0] +Powermail' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/3.11/', 'Caddy [7.0.0] +Powermail 3.11 (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/3x/', 'Caddy [7.0.0] +Powermail 3.x (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/2x/', 'Caddy [7.0.0] +Powermail 2.x (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/1x/', 'Caddy [7.0.0] +Powermail 1.x (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/4x/Bootstrap/', 'Caddy [7.0.1] +Powermail Bootstrap' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/3x/css/', 'Caddy [7.1.0] +Powermail CSS fancy' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/2x/css/', 'Caddy [7.1.0] +Powermail 2.x (deprecated!) CSS fancy' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/3x/Bootstrap/3x/', 'Caddy [7.2.0] +Powermail Bootstrap' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/2x/Bootstrap/3x/', 'Caddy [7.2.0] +Powermail 2.x (deprecated!) Bootstrap' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/3x/Foundation/5x/', 'Caddy [7.3.0] +Powermail Foundation (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Powermail/2x/Foundation/5x/', 'Caddy [7.3.0] +Powermail 2.x (deprecated!) Foundation' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Properties/ch/', 'Caddy [8.1.0] +Properties ch (Switzerland)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Properties/de/', 'Caddy [8.1.0] +Properties de (Germany)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'EPayment/paymill/bootstrap/4x/', 'Caddy [9.0.0] +E-Payment: Paymill Bootstrap 4x' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'EPayment/paymill/bootstrap/3x/', 'Caddy [9.0.0] +E-Payment: Paymill Bootstrap 3x' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'EPayment/paymill/5x/', 'Caddy [9.0.0] +E-Payment: Paymill Foundation' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'EPayment/paymill/4x/', 'Caddy [9.0.0] +E-Payment: Paymill Foundation 4.x (deprecated!)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Browser/Export/162/', 'Caddy [20.0.0] Browser view 162: Orders' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'tt_address/subscribe/', 'Caddy [30.0.0] E-mail subscribe (tt_address)' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'JQuery/', 'Caddy [90.0.0] +v4.x jQuery (dev only!)' );
// \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Bugfix/Powermail/TyposcriptField/', 'Caddy [98] Bugix: Powermail Typoscript Fields' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( $_EXTKEY, $path2Ts . 'Reset/', 'Caddy [99.0.0] Reset' );
<?php
if( !defined( 'TYPO3_MODE' ) )
{
$prompt = 'Access denied.<br />' . __FILE__ . ' (#' . __LINE__ . ')';
die( $prompt );
}
$confArr = unserialize( $GLOBALS[ 'TYPO3_CONF_VARS' ][ 'EXT' ][ 'extConf' ][ 'caddy' ] );
/* * ****************************************************************************
*
* INDEX
* Set TYPO3 version
* Set powermail version
* Configuration by the extension manager
* Database read only
* Localization support
* Enables the Include Static Templates
* Add pagetree icons
* Methods for backend workflows
* Plugin Configuration
* Allow tables on pages
* Enables Page TSconfig for powermail
* locallangXMLOverride
*
* **************************************************************************** */
////////////////////////////////////////////////////////////////////////////
//
// Set TYPO3 version
// Set TYPO3 version as integer (sample: 4.7.7 -> 4007007)
list( $main, $sub, $bugfix ) = explode( '.', TYPO3_version );
$version = ( ( int ) $main ) * 1000000;
$version = $version + ( ( int ) $sub ) * 1000;
$version = $version + ( ( int ) $bugfix ) * 1;
$typo3Version = $version;
// Set TYPO3 version as integer (sample: 4.7.7 -> 4007007)
if( $typo3Version < 6000000 )
{
$prompt = '<h1>ERROR</h1>
<h2>Unproper TYPO3 version</h2>
<ul>
<li>
TYPO3 version is smaller than 6.0.0
</li>
<li>
constant TYPO3_version: ' . TYPO3_version . '
</li>
<li>
integer $this->typo3Version: ' . ( int ) $this->typo3Version . '
</li>
</ul>
';
die( $prompt );
}
// Set TYPO3 version
////////////////////////////////////////////////////////////////////////////
//
// Set powermail version
// #i0226, 180312, dwildt, ~
$userfunc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \Netzmacher\Caddy\Lib\Userfunc\Userfunc::class );
$arrResult = $userfunc->extMgmVersion( 'powermail' );
$versionInt = $arrResult[ 'int' ];
//$versionStr = $arrResult['str'];
switch( true )
{
case( $versionInt < 1000000 ):
$prompt = 'ERROR: unexpected result<br />
powermail version is below 1.0.0: ' . $versionInt . '<br />
ext_tables.php method: ' . __METHOD__ . ' (line ' . __LINE__ . ')<br />
TYPO3 extension: ' . $_EXTKEY;
// 130720, dwildt, 1-: die( ) blocks the whole TYPO3 system
//die( $prompt );
// 130720, dwildt, 1+
$pmVers = '0x';
break;
case( $versionInt < 2000000 ):
$pmVers = '1x';
break;
case( $versionInt < 3000000 ):
$pmVers = '2x';
break;
case( $versionInt < 4000000 ):
$pmVers = '3x';
break;
case( $versionInt < 5000000 ):
$pmVers = '4x';
break;
case( $versionInt < 6000000 ):
$pmVers = '5x';
break;
case( $versionInt < 7000000 ):
$pmVers = '6x';
break;
case( $versionInt >= 7000000 ):
default:
$prompt = 'ERROR: unexpected result<br />
powermail version is higher than 6.x: ' . $versionInt . '<br />
ext_tables.php method: ' . __METHOD__ . ' (line ' . __LINE__ . ')<br />
TYPO3 extension: ' . $_EXTKEY;
// 130720, dwildt, 1-: die( ) blocks the whole TYPO3 system
//die( $prompt );
$pmVers = '7x';
break;
}
// Set powermail version
////////////////////////////////////////////////////////////////////////////
//
// Configuration by the extension manager
/* * ****************************************************************************
* Add Static Files
* **************************************************************************** */
require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( $_EXTKEY ) . 'Configuration/ExtTables/Default/addStaticFile.php');
/* * ****************************************************************************
* Register Icons
* **************************************************************************** */
// #t1806, 171207, dwildt, 1-/+
//\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( \Netzmacher\Caddy\Utility\TCA\Icons::class )->tcaPages();
require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( $_EXTKEY ) . 'Configuration/ExtTables/Default/IconRegistry.php');
require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( $_EXTKEY ) . 'Configuration/ExtTables/Default/SvgIconProvider.php');
///////////////////////////////////////////////////////////
//
// Methods for backend workflows
//require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'Resources/Public/Lib/flexform/class.tx_caddy_flexform.php');
// #i0226, 180312, dwildt, 1-
//require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( $_EXTKEY ) . 'Classes/Lib/Userfunc/class.tx_caddy_userfunc.php');
// Methods for backend workflows
////////////////////////////////////////////////////////////////////////////
//
// Plugin Configuration
// #t0687, 160702, dwildt, 1-
//\TYPO3\CMS\Core\Utility\GeneralUtility::loadTCA( 'tt_content' );
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi1' ] = 'layout,select_key,recursive,pages';
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi1' ] = 'pi_flexform';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi1',
$_EXTKEY . '_pi1',
\Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif'
), 'list_type' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi1', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi1/flexform' . $pmVers . '.xml' );
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi2' ] = 'layout,select_key,recursive,pages';
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi2' ] = 'pi_flexform';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi2',
$_EXTKEY . '_pi2',
\Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'Resources/Public/Images/caddy_000_13.png'
), 'list_type' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi2', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi2/flexform.xml' );
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi3' ] = 'layout,select_key,recursive,pages';
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi3' ] = 'pi_flexform';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi3',
$_EXTKEY . '_pi3',
\Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif'
), 'list_type' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi3', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi3/flexform.xml' );
// Plugin Configuration
/* * ****************************************************************************
* Allow tables on pages
* **************************************************************************** */
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages( 'tx_caddy_item ' );
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages( 'tx_caddy_order ' );
/* * ****************************************************************************
* Enables Page TSconfig for powermail
* **************************************************************************** */
// #i0141, 170327, dwuldt, 1+
require_once( PATH_typo3conf . 'ext/caddy/Configuration/ExtTables/TSconfig/Page/TxPowermail/default.php' );
...@@ -141,11 +141,15 @@ require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( $_EXTK ...@@ -141,11 +141,15 @@ require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath( $_EXTK
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi1' ] = 'layout,select_key,recursive,pages'; $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi1' ] = 'layout,select_key,recursive,pages';
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi1' ] = 'pi_flexform'; $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi1' ] = 'pi_flexform';
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi1', (
$_EXTKEY . '_pi1', 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi1'
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif' , $_EXTKEY . '_pi1'
), 'list_type' ); , \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif'
)
, 'list_type'
, $_EXTKEY
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi1', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi1/flexform' . $pmVers . '.xml' ); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi1', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi1/flexform' . $pmVers . '.xml' );
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi2' ] = 'layout,select_key,recursive,pages'; $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi2' ] = 'layout,select_key,recursive,pages';
...@@ -153,8 +157,11 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi ...@@ -153,8 +157,11 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi2', 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi2',
$_EXTKEY . '_pi2', $_EXTKEY . '_pi2',
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'Resources/Public/Images/caddy_000_13.png' \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'Resources/Public/Images/caddy_000_13.png'
), 'list_type' ); )
, 'list_type'
, $_EXTKEY
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi2', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi2/flexform.xml' ); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi2', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi2/flexform.xml' );
$TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi3' ] = 'layout,select_key,recursive,pages'; $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_excludelist' ][ $_EXTKEY . '_pi3' ] = 'layout,select_key,recursive,pages';
...@@ -162,8 +169,11 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi ...@@ -162,8 +169,11 @@ $TCA[ 'tt_content' ][ 'types' ][ 'list' ][ 'subtypes_addlist' ][ $_EXTKEY . '_pi
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin( array(
'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi3', 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tt_content.list_type_pi3',
$_EXTKEY . '_pi3', $_EXTKEY . '_pi3',
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif' \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.gif'
), 'list_type' ); )
, 'list_type'
, $_EXTKEY
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi3', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi3/flexform.xml' ); \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue( $_EXTKEY . '_pi3', 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/Pi3/flexform.xml' );
// Plugin Configuration // Plugin Configuration
......
...@@ -22,7 +22,7 @@ $tx_caddy_item = array( ...@@ -22,7 +22,7 @@ $tx_caddy_item = array(
'default_sortby' => 'ORDER BY tx_caddy_order DESC, title', 'default_sortby' => 'ORDER BY tx_caddy_order DESC, title',
'readOnly' => $confArr[ 'databaseReadonly' ], 'readOnly' => $confArr[ 'databaseReadonly' ],
'dividers2tabs' => true, 'dividers2tabs' => true,
'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.svg', 'iconfile' => \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.svg',
'searchFields' => '' 'searchFields' => ''
. 'externalTable,' . 'externalTable,'
. 'externalUid,' . 'externalUid,'
......
...@@ -22,7 +22,7 @@ $tx_caddy_order = array( ...@@ -22,7 +22,7 @@ $tx_caddy_order = array(
'readOnly' => $confArr[ 'databaseReadonly' ], 'readOnly' => $confArr[ 'databaseReadonly' ],
'hideAtCopy' => true, 'hideAtCopy' => true,
'dividers2tabs' => true, 'dividers2tabs' => true,
'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.svg', 'iconfile' => \Netzmacher\Refresh\Compatibility\Core\Utility\ExtensionManagementUtility::extRelPath( $_EXTKEY ) . 'ext_icon.svg',
'searchFields' => '' 'searchFields' => ''
. 'customerEmail,' . 'customerEmail,'
//#i0160, 170919, dwildt, + //#i0160, 170919, dwildt, +
......
plugin.caddy { plugin.caddy {
# cat=caddy - tax/enable/100; type=string; label= Vat is plus or inclusive:Abbreviation like plus or incl. (only labeling) # cat=caddy - tax/enable/100; type=string; label= Vat is plus or inclusive:Abbreviation like plus or incl. (only labeling)
tax.mode.abbr.en = incl. tax.mode.abbr.en = incl.
# cat=caddy - tax/enable/101; type=string; label= Vat is plus or inclusive:German abbreviation like zzgl. or inkl. (only labeling) # cat=caddy - tax/enable/101; type=string; label= Vat is plus or inclusive:German abbreviation like zzgl. or inkl. (only labeling)
tax.mode.abbr.de = inkl. tax.mode.abbr.de = inkl.
# cat=caddy - tax/enable/102; type=string; label= Vat is plus or inclusive:Spanish abbreviation like más or incl. (only labeling)
tax.mode.abbr.es = incl.
# cat=caddy - tax//200; type=text; label= VAT Reg.No.:VAT Reg.No. (German: USt-IdNr.) # cat=caddy - tax//200; type=text; label= VAT Reg.No.:VAT Reg.No. (German: USt-IdNr.)
tax.vatregno = See: Constant Editor [CADDY - TAX] > VAT Reg.No. tax.vatregno = See: Constant Editor [CADDY - TAX] > VAT Reg.No.
# cat=caddy - tax//250; type=text; label= Rate reduced label: Tax rate for reduced items (e.g. 7). Value will be displayed. # cat=caddy - tax//250; type=text; label= Rate reduced label: Tax rate for reduced items (e.g. 7). Value will be displayed.
......
...@@ -327,11 +327,7 @@ plugin.tx_caddy_pi1 { ...@@ -327,11 +327,7 @@ plugin.tx_caddy_pi1 {
// plus value // plus value
10 = TEXT 10 = TEXT
10 { 10 {
value = plus data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:plus
lang {
de = zuz&uuml;glich
en = plus
}
noTrimWrap = || {$plugin.caddy.tax.reduced}{$plugin.caddy.main.percentSymbol} | noTrimWrap = || {$plugin.caddy.tax.reduced}{$plugin.caddy.main.percentSymbol} |
} }
// VAT // VAT
...@@ -346,11 +342,7 @@ plugin.tx_caddy_pi1 { ...@@ -346,11 +342,7 @@ plugin.tx_caddy_pi1 {
// plus value // plus value
10 = TEXT 10 = TEXT
10 { 10 {
value = plus data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:plus
lang {
de = zuz&uuml;glich
en = plus
}
noTrimWrap = || {$plugin.caddy.tax.normal}{$plugin.caddy.main.percentSymbol} | noTrimWrap = || {$plugin.caddy.tax.normal}{$plugin.caddy.main.percentSymbol} |
} }
// VAT // VAT
......
...@@ -24,6 +24,7 @@ temp.caddy { ...@@ -24,6 +24,7 @@ temp.caddy {
lang { lang {
de = Bitte überweisen Sie de = Bitte überweisen Sie
en = Kindly remit the balance en = Kindly remit the balance
es = Por favor remita el balance
} }
noTrimWrap = || | noTrimWrap = || |
} }
...@@ -38,11 +39,7 @@ temp.caddy { ...@@ -38,11 +39,7 @@ temp.caddy {
// until // until
21 = TEXT 21 = TEXT
21 { 21 {
value = until data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:plus
lang {
de = bis
en = until
}
noTrimWrap = | | | noTrimWrap = | | |
} }
// due date // due date
...@@ -64,6 +61,7 @@ temp.caddy { ...@@ -64,6 +61,7 @@ temp.caddy {
lang { lang {
de = mit dem Vermerk de = mit dem Vermerk
en = with the annotation en = with the annotation
es = con la anotación
} }
noTrimWrap = | | | noTrimWrap = | | |
} }
...@@ -96,6 +94,7 @@ temp.caddy { ...@@ -96,6 +94,7 @@ temp.caddy {
lang { lang {
de = auf unser Konto de = auf unser Konto
en = to our account en = to our account
es = a nuestra cuenta
} }
noTrimWrap = | |:<br />| noTrimWrap = | |:<br />|
} }
...@@ -164,6 +163,7 @@ temp.caddy { ...@@ -164,6 +163,7 @@ temp.caddy {
lang { lang {
de = Wir w&uuml;rden uns freuen, wenn Sie uns weiterempfehlen. de = Wir w&uuml;rden uns freuen, wenn Sie uns weiterempfehlen.
en = We will be happy, if you recommend us. en = We will be happy, if you recommend us.
es = Estaremos encantados, si nos recomiendan.
} }
wrap = <p>|</p> wrap = <p>|</p>
}