Commit 6c09ecb8 by Dirk Wildt

7.5.0

parent de7daaf7
......@@ -5,7 +5,18 @@ TODO
7.5.0
17-08-11
Development
* #i0156: Paypal icons. See at:
* Resources/Public/Images/Paypal
Improvement
* #i0159: Text-align of columns quantity and tax are controlled by the Constant Editor > CADDY - HTML - TEXT-ALIGN
* #i0158: Symbols in HTML template are controlled by the Constant Editor > CADDY - SYMBOLS:
* minus: ./.
* plus: +
* sum: #
BE AWARE: All HTLM templates are changed:
* Symbols from above are replaced by _HTMLMARKER_CADDY_SYMBOLFOR...
* #i0157: Templates for properties ch and de got the german date format
* #i0155: ReST-Documentation
7.4.7
......
......@@ -4,4 +4,5 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/html/marker.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/html/minicaddy.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/html/powermail.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/html/text-align.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/html/width.ts">
\ No newline at end of file
plugin.caddy {
# cat=caddy - html - text-align//200; type=options[center,left,right]; label= Text align of the column quantity: The text-align of the caddy column quantity in HTML tables for CSS.
html.text-align.table.td.qty = right
# cat=caddy - html - text-align//201; type=options[center,left,right]; label= Text align of the column tax: The text-align of the caddy column tax in HTML tables for CSS.
html.text-align.table.td.tax = right
# cat=caddy - html - text-align/others/998; type=user[EXT:caddy/Resources/Private/Lib/userfunc/class.tx_caddy_userfunc.php:tx_caddy_userfunc->promptExternalLinks]; label=External Links:typo3-caddy.de
html.text-align.externalLinks = Click me!
# cat=caddy - html - text-align/others/999; type=user[EXT:caddy/Resources/Private/Lib/userfunc/class.tx_caddy_userfunc.php:tx_caddy_userfunc->promptSponsors]; label=Subsidise the Caddy project!
html.text-align.sponsors = Click me!
}
\ No newline at end of file
plugin.caddy {
# cat=caddy - symbols and service attributes//100; type=text; label= Minus symbol: for example: ./.
symbol.minus = ./.
# cat=caddy - symbols and service attributes//101; type=text; label= Plus symbol: for example: +
symbol.plus = +
# cat=caddy - symbols and service attributes//102; type=text; label= Sum symbol: for example: #
symbol.sum = #
# cat=caddy - symbols and service attributes//707; type=text; label= Quantity symbol: for example: pc. (English), St. (German)
symbol.quantitySymbol = pc.
# cat=caddy - symbols and service attributes//708; type=text; label= Service Attribute 1 symbol: e.g. Weight: g, kg, lbs
......
......@@ -5,4 +5,5 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/htmlmarker/caddy_ordernote.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/htmlmarker/caddy_prompt_cashdiscount.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/htmlmarker/caddy_prompt_order.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/htmlmarker/caddy_symbols.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/htmlmarker/linktoshop.ts">
\ No newline at end of file
plugin.tx_caddy_pi1 {
// empty statement for proper comments only
_HTMLMARKER {
}
// caddy_symbolforminus, caddy_symbolforplus, caddy_symbolforsum
_HTMLMARKER =
_HTMLMARKER {
// minus
caddy_symbolforminus = TEXT
caddy_symbolforminus {
value = {$plugin.caddy.symbol.minus}
}
// plus
caddy_symbolforplus = TEXT
caddy_symbolforplus {
value = {$plugin.caddy.symbol.plus}
}
// sum
caddy_symbolforsum = TEXT
caddy_symbolforsum {
value = {$plugin.caddy.symbol.sum}
}
}
}
......@@ -20,6 +20,8 @@ plugin.tx_caddy_pi1 {
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......
......@@ -13,10 +13,12 @@ plugin.tx_caddy_pi1 {
all = ###CADDY_EMAIL###
item = ###ITEM###
}
// border, cellpadding, cellspacing
// border, text-align_td_..., width_td_...
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......
......@@ -16,10 +16,12 @@ plugin.tx_caddy_pi1 {
all = ###CADDY_EMAILDELIVERY###
item = ###ITEM###
}
// border, cellpadding, cellspacing
// border, text-align_td_..., width_td_...
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......@@ -40,10 +42,12 @@ plugin.tx_caddy_pi1 {
all = ###CADDY_EMAIL###
item = ###ITEM###
}
// border, cellpadding, cellspacing
// border, text-align_td_..., width_td_...
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......@@ -64,10 +68,12 @@ plugin.tx_caddy_pi1 {
all = ###CADDY_EMAIL###
item = ###ITEM###
}
// border, cellpadding, cellspacing
// border, text-align_td_..., width_td_...
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......@@ -88,10 +94,12 @@ plugin.tx_caddy_pi1 {
all = ###CADDY_REVOCATION###
item = ###ITEM###
}
// border, cellpadding, cellspacing
// border, text-align_td_..., width_td_...
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......@@ -112,10 +120,12 @@ plugin.tx_caddy_pi1 {
all = ###CADDY_TERMS###
item = ###ITEM###
}
// border, cellpadding, cellspacing
// border, text-align_td_..., width_td_...
table =
table {
bordercolor = {$plugin.caddy.html.color.border}
text-align_td_qty = {$plugin.caddy.html.text-align.table.td.qty}
text-align_td_tax = {$plugin.caddy.html.text-align.table.td.tax}
width_td_qty = {$plugin.caddy.html.width.table.td.qty}
width_td_sku = {$plugin.caddy.html.width.table.td.sku}
width_td_item = {$plugin.caddy.html.width.table.td.item}
......
......@@ -8,6 +8,11 @@ plugin.caddy {
percentSymbol = %
thousands_sep = '
}
pdf {
date {
strftime = %d. %b. %Y
}
}
symbol {
quantitySymbol = St.
}
......
......@@ -8,6 +8,11 @@ plugin.caddy {
percentSymbol = %
thousands_sep = .
}
pdf {
date {
strftime = %d. %b. %Y
}
}
symbol {
quantitySymbol = St.
}
......
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _epayment-1-requirements-1-contract:
Contract
^^^^^^^^
A contract with an e-payment provider (here: Paymill – see below)
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _epayment-1-requirements-1-php:
PHP
^^^
The PHP class curl must be enabled.
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _epayment-1-requirements-1-responsive-1:
Responsive
^^^^^^^^^^
The e-payment form is responsive. Sorry, but there isn't any other HTML template and any other
TypoScript template prepared. Thus you have to
- include the static templates for the responsive design.
See "<text:bookmark-ref text:reference-format="text"
text:ref-name="__RefHeading__13611_1310094425">Responsive Design</text:bookmark-ref>" on page
<text:bookmark-ref text:reference-format="page"
text:ref-name="__RefHeading__13611_1310094425">13</text:bookmark-ref> <text:bookmark-ref
text:reference-format="direction"
text:ref-name="__RefHeading__13611_1310094425">above</text:bookmark-ref>.
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _epayment-1-screenshots-2-paymill:
Paymill
^^^^^^^
<draw:text-box draw:style-name="fr1" draw:name="Frame49" text:anchor-type="as-char" svg:width="8cm"
draw:z-index="420" fo:min-height="4.923cm">|image-70| Illustration <text:sequence
text:ref-name="refIllustration10" text:name="Illustration" text:formula="Illustration+1"
style:num-format="1">11</text:sequence>: Caddy e-payment (Paymill) in
<text:alphabetical-index-mark-start text:id="IMark140191625074680" text:key1="E-Payment"/>live
mode<text:alphabetical-index-mark-end text:id="IMark140191625074680"/></draw:text-box>
<draw:text-box draw:style-name="fr1" draw:name="Frame47" text:anchor-type="as-char" svg:width="8cm"
draw:z-index="422" fo:min-height="4.923cm">|image-71| Illustration <text:sequence
text:ref-name="refIllustration11" text:name="Illustration" text:formula="Illustration+1"
style:num-format="1">12</text:sequence>: Caddy e-payment (Paymill) in
<text:alphabetical-index-mark-start text:id="IMark140191624977448" text:key1="E-Payment"/>test
mode<text:alphabetical-index-mark-end text:id="IMark140191624977448"/></draw:text-box>
.. |image-70| image:: ../../../Images/image-70.png
.. |image-71| image:: ../../../Images/image-71.png
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _epayment-1-screenshots-2-paymill-transaction:
Paymill Transaction
^^^^^^^^^^^^^^^^^^^
<draw:text-box draw:style-name="fr1" draw:name="Frame52" text:anchor-type="as-char" svg:width="8cm"
draw:z-index="424" fo:min-height="4.923cm">|image-60| Illustration <text:sequence
text:ref-name="refIllustration12" text:name="Illustration" text:formula="Illustration+1"
style:num-format="1">13</text:sequence>: Transactions (Paymill test mode)</draw:text-box>
<draw:text-box draw:style-name="fr1" draw:name="Frame53" text:anchor-type="as-char" svg:width="8cm"
draw:z-index="426" fo:min-height="4.923cm">|image-61| Illustration <text:sequence
text:ref-name="refIllustration13" text:name="Illustration" text:formula="Illustration+1"
style:num-format="1">14</text:sequence>: Transaction (Paymill test mode)</draw:text-box>
.. |image-60| image:: ../../../Images/image-60.png
.. |image-61| image:: ../../../Images/image-61.png
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../Includes.txt
.. _epayment-1-workflow:
Workflow
--------
Any knowledge about the e-payment workflow is needed. But if you are interested, read the section
below.
.. toctree::
:maxdepth: 2
:titlesonly:
Paymill1/Index
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../Includes.txt
.. _epayment-1-workflow-paymill-1:
Paymill
^^^^^^^
Caddy handles e-payment in the two steps:
- Evaluation
- Transaction
In detail:
#. data for e-payment are evaluated by JavaScript [#ftn11]_
#. data will send to Paymill
#. if data are proper, Paymill sends back a token
#. if data aren't proper, Paymill tries to send a qualified error prompt or Caddy tries to generate
a qualified error prompt.
#. if data for e-payment are proper, the customer can send the order to your server
#. the order doesn't contain any e-payment account data but the Paymill token [#ftn12]_
#. your server sends the token and some other data like the amount and the invoice number to the
server of Paymill for transaction
#. if the transaction is successful, caddy
#. sends the confirmation e-mail to the shop owner and a copy to the customer
#. stores some order data in the database
#. if the transaction fails, caddy
#. outputs a HTML error page with a qualified prompt
#. the customer can go back to the order
#. if data for e-payment aren't proper, the customer can't send the order to your server
.. -- FOOTNOTES GO HERE --
.. [#ftn11] Caddy is using the <text:alphabetical-index-mark text:string-value="Javascript Bridge"
text:key1="Paymill"/>PAYMILL Javascript Bridge. The clients' sensitive data is sent directly to
PAYMILL and is never touches your servers.
.. [#ftn12] dito
\ No newline at end of file
......@@ -25,4 +25,12 @@ But if you like to run Caddy with your own extension use this workflow:
* update your database (all Quick Shop data will removed)
* Adapt Caddy to your needs
\ No newline at end of file
* Adapt Caddy to your needs
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -20,4 +20,12 @@ Table of Content
:titlesonly:
01_QuickShop/Index
03_Manually/Index
\ No newline at end of file
03_Manually/Index
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -9,4 +9,12 @@
.. _integrators-setup-plugins-caddy:
Caddy
=====
\ No newline at end of file
=====
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -9,4 +9,12 @@
.. _integrators-setup-plugins-powermail:
Powermail
=========
\ No newline at end of file
=========
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -16,4 +16,12 @@ Plugins
:titlesonly:
01_Caddy/Index
02_Powermail/Index
\ No newline at end of file
02_Powermail/Index
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -9,4 +9,12 @@
.. _integrators-setup-userinterface:
User Interface
==============
\ No newline at end of file
==============
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -9,4 +9,12 @@
.. _integrators-setup-calculating:
Calculating
===========
\ No newline at end of file
===========
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. _integrators-setup-epayment-screenshots:
Screenshots
===========
Paymill
-------
.. figure:: image-70.png
:width: 600px
:alt: Caddy e-payment (Paymill) in live mode
Caddy e-payment (Paymill) in live mode
.. figure:: image-71.png
:width: 600px
:alt: Caddy e-payment (Paymill) in test mode
Caddy e-payment (Paymill) in test mode
Paymill Transaction
-------------------
.. figure:: image-60.png
:width: 600px
:alt: Transactions (Paymill test mode)
Transactions (Paymill test mode)
.. figure:: image-61.png
:width: 600px
:alt: Transaction Detail (Paymill test mode)
Transaction Detail (Paymill test mode)
\ No newline at end of file
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. _integrators-setup-epayment-requirements:
Requirements
============
Contract
--------
A contract with an e-payment provider (here: Paymill – see below)
PHP
---
The PHP class curl must be enabled.
Responsive
----------
The e-payment form is responsive. Sorry, but there isn't any other HTML template and any other
TypoScript template prepared. Thus you have to
* include the static templates for the responsive design.
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-setup-includetemplate:
Include the e-payment template
==============================
Please add the e-payment template to the TypoScript of your page.
Include static (from extensions):
- Main Template (powermail)
- Caddy [5] Powermail (caddy)
- Caddy [6] + Powermail Foundation 5.x (caddy)
- Caddy [8] + E-Payment: Paymill Foundation 5.x(caddy)
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-setup-configurepaymill:
Configure Paymill
=================
After including the e-payment template, you have a lot of new options for configuration. See
- TypoScript Constant Editor > Category: [CADDY – E-PAYMENT – PAYMILL\*]
Please add your private and public keys.
Test- and Live-Mode
-------------------
Paymill is running in test mode by default. You can test transactions without any real payment.
If you like to switch to the live mode, please configure
- TypoScript Constant Editor > Category: [CADDY – E-PAYMENT – PAYMILL\*] > Mode
.. ==================================================
.. FOR YOUR INFORMATION
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../../Includes.txt
.. _integrators-setup-epayment-setup-constanteditor:
Constant Editor
===============
Manual 6.3.1
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.1)`_
\ No newline at end of file
......@@ -3,18 +3,26 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../Includes.txt
.. include:: ../../../../Includes.txt
.. _epayment-1-requirements-1:
.. _integrators-setup-epayment-setup:
Requirements
------------
Setup
=====
.. toctree::
:maxdepth: 2
:titlesonly:
Contract/Index
Php/Index
Responsive1/Index
01_IncludeTheEpaymentTemplate/Index
02_ConfigurePaymill/Index
03_ConstantEditor/Index
Manual 6.3.1