Commit d6a28f80 authored by Dirk Wildt's avatar Dirk Wildt

8.15.1

parent 721b525d
......@@ -183,7 +183,7 @@ class tx_caddy_pi3 extends \Netzmacher\Caddy\AbstractPlugin
$conf = [
'value' => $this->zz_quantity(),
'typolink.' => [
'parameter'=> $this->conf[ 'pid' ],
'parameter' => $this->conf[ 'pid' ],
]
];
$content = $this->ContentObjectRenderer->cObjGetSingle( $this->local_cObj, $method, $conf );
......@@ -423,14 +423,14 @@ class tx_caddy_pi3 extends \Netzmacher\Caddy\AbstractPlugin
*/
private function initPid()
{
// Take pid from TypoScript
$this->pidCaddy = $this->conf[ 'pid' ];
// Take pid from the flexform
$this->pidCaddy = $this->flexform->sdefPidCaddy;
// IF : pid is empty
if( empty( $this->pidCaddy ) )
{
// Take pid from the flexform
$this->pidCaddy = $this->flexform->sdefPidCaddy;
// Take pid from TypoScript
$this->pidCaddy = $this->conf[ 'pid' ];
}
// IF : pid is empty
// DIE : $row is empty
......
......@@ -5,7 +5,5 @@
</meta>
<sheets>
<sDEF>EXT:caddy/Configuration/FlexForms/Pi3/flexform_sheet_sDEF.xml</sDEF>
<sponsors>EXT:caddy/Configuration/FlexForms/Pi1/flexform_sheet_sponsors.xml</sponsors>
<help>EXT:caddy/Configuration/FlexForms/Pi1/flexform_sheet_help.xml</help>
</sheets>
</T3DataStructure>
\ No newline at end of file
......@@ -6,21 +6,6 @@
</TCEforms>
<type>array</type>
<el>
<sdefPidCaddy>
<TCEforms>
<label>LLL:EXT:caddy/Resources/Private/Language/FlexForms/Pi3/locallang_flexform.xml:sdefPidCaddy</label>
<config>
<type>group</type>
<internal_type>db</internal_type>
<allowed>
pages
</allowed>
<minitems>0</minitems>
<maxitems>1</maxitems>
<size>1</size>
</config>
</TCEforms>
</sdefPidCaddy>
<sdefCaddyMode>
<TCEforms>
<label>LLL:EXT:caddy/Resources/Private/Language/FlexForms/Pi3/locallang_flexform.xml:sdefCaddyMode</label>
......@@ -46,6 +31,21 @@
</config>
</TCEforms>
</sdefCaddyMode>
<sdefPidCaddy>
<TCEforms>
<label>LLL:EXT:caddy/Resources/Private/Language/FlexForms/Pi3/locallang_flexform.xml:sdefPidCaddy</label>
<config>
<type>group</type>
<internal_type>db</internal_type>
<allowed>
pages
</allowed>
<minitems>0</minitems>
<maxitems>1</maxitems>
<size>1</size>
</config>
</TCEforms>
</sdefPidCaddy>
<sdefDrs>
<TCEforms>
<label>LLL:EXT:caddy/Resources/Private/Language/FlexForms/Pi1/locallang_flexform.xml:sdefDrs</label>
......
......@@ -6,7 +6,7 @@
.. include:: ../../Includes.txt
.. _integrators-errorhandling:
.. _administrators-errorhandling:
Error Handling
==============
......
......@@ -6,10 +6,10 @@
.. include:: ../Includes.txt
.. _integrators:
.. _administrators:
Integrators
===========
Administrators
==============
Index
......@@ -19,6 +19,6 @@ Index
:maxdepth: 3
:titlesonly:
01_Installation/Index
02_Setup/Index
03_ErrorHandling/Index
\ No newline at end of file
Installation/Index
Setup/Index
ErrorHandling/Index
\ No newline at end of file
......@@ -6,7 +6,7 @@
.. include:: ../../../Includes.txt
.. _integrators-installation-launchquickshop:
.. _administrators-installation-launchquickshop:
Launch Quick Shop!
==================
......
......@@ -6,7 +6,7 @@
.. include:: ../../../Includes.txt
.. _integrators-installation-manually:
.. _administrators-installation-manually:
Manually
========
......
......@@ -6,7 +6,7 @@
.. include:: ../../Includes.txt
.. _integrators-installation:
.. _administrators-installation:
Installation
============
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators_setup_accordion:
.. _administrators_setup_accordion:
Accordion
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup-atanyrate:
.. _administrators_setup_caddy-atanyrate:
At any rate
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators_setup_attachments:
.. _administrators_setup_attachments:
Attachments
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators_setup_attachments_individual:
.. _administrators_setup_attachments_individual:
Individual
......@@ -24,7 +24,7 @@ Attachments for
* terms & conditions
will generated on the fly. See :ref:`Plugin > Caddy <editors-setup-plugins-caddy>`
will generated on the fly. See :ref:`Plugin > Caddy <users-setup-plugins-caddy>`
But if there is a need, to attach another file, you can attach it.
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators_setup_attachments_plugin:
.. _administrators_setup_attachments_plugin:
Plugin
......@@ -28,11 +28,11 @@ will generated on the fly.
You are controlling attachments by the Caddy plugin.
See :ref:`Plugin > Caddy <editors-setup-plugins-caddy>`
See :ref:`Plugin > Caddy <users-setup-plugins-caddy>`
But if there is a need, to attach another file, you can attach it.
See :ref:`Attachments > Individual <integrators_setup_attachments_individual>`
See :ref:`Attachments > Individual <administrators_setup_attachments_individual>`
Known bugs
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-calculating-default:
.. _administrators_setup_caddy-calculating-default:
Default Code
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-calculating-basedonprice:
.. _administrators_setup_caddy-calculating-basedonprice:
Based on Price
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-calculating-basedonquantity:
.. _administrators_setup_caddy-calculating-basedonquantity:
Based on Quantity
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-calculating-basedoneach:
.. _administrators_setup_caddy-calculating-basedoneach:
Based on Each
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-calculating-basedonweight:
.. _administrators_setup_caddy-calculating-basedonweight:
Based on Weight
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup-calculating:
.. _administrators_setup_caddy-calculating:
Calculating
===========
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-screenshots:
.. _administrators_setup_caddy-epayment-screenshots:
Screenshots
===========
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-requirements:
.. _administrators_setup_caddy-epayment-requirements:
Requirements
============
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. include:: ../../../../../../Includes.txt
.. _integrators-setup-epayment-setup-includetemplate:
.. _administrators_setup_caddy-epayment-setup-includetemplate:
Include the e-payment template
==============================
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. include:: ../../../../../../Includes.txt
.. _integrators-setup-epayment-setup-configurepaymill:
.. _administrators_setup_caddy-epayment-setup-configurepaymill:
Configure Paymill
=================
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. include:: ../../../../../../Includes.txt
.. _integrators-setup-epayment-setup-constanteditor:
.. _administrators_setup_caddy-epayment-setup-constanteditor:
Constant Editor
===============
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-setup:
.. _administrators_setup_caddy-epayment-setup:
Setup
=====
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _editors-setup-plugins-workflow:
.. _users-setup-plugins-workflow:
Workflow
========
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. include:: ../../../../../../Includes.txt
.. _integrators-setup-epayment-paypal-requirements:
.. _administrators_setup_caddy-epayment-paypal-requirements:
Requirements
============
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-paypal:
.. _administrators_setup_caddy-epayment-paypal:
Paypal
======
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup-epayment:
.. _administrators_setup_caddy-epayment:
E-payment
=========
......
......@@ -3,12 +3,12 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../Includes.txt
.. include:: ../../../Includes.txt
.. _integrators-setup:
.. _administrators_setup_caddy:
Setup
Caddy
=====
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators_setup_labelling:
.. _administrators_setup_labelling:
Labelling
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators_setup_localisation:
.. _administrators_setup_localisation:
Localisation
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup-newsletter:
.. _administrators_setup_caddy-newsletter:
Newsletter
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators_setup_powermail:
.. _administrators_setup_powermail:
Powermail
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup_privacy_clearfiles:
.. _administrators_setup_caddy_privacy_clearfiles:
Clear Files
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup_privacy_clearrecords:
.. _administrators_setup_caddy_privacy_clearrecords:
Clear Records
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup_privacy:
.. _administrators_setup_caddy_privacy:
Privacy
=======
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators_setup_templating:
.. _administrators_setup_templating:
Templating
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup-userinterface:
.. _administrators_setup_caddy-userinterface:
User Interface
==============
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup_variants_foroneitem:
.. _administrators_setup_caddy_variants_foroneitem:
For one Item
============
\ No newline at end of file
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. include:: ../../../../../../Includes.txt
.. _integrators-setup_variants_forallitems_snippet:
.. _administrators_setup_caddy_variants_forallitems_snippet:
Snippet
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. include:: ../../../../../../Includes.txt
.. _integrators-setup_variants_forallitems_limits:
.. _administrators_setup_caddy_variants_forallitems_limits:
Limits
======
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../../../Includes.txt
.. _integrators-setup_variants_forallitems:
.. _administrators_setup_caddy_variants_forallitems:
For all Items
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. include:: ../../../../Includes.txt
.. _integrators-setup_variants:
.. _administrators_setup_caddy_variants:
Variants
========
......
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _administrators_setup_export: