Commit b51817d7 authored by Dirk Wildt's avatar Dirk Wildt

8.17.8

parent 74331262
......@@ -4,11 +4,46 @@ TODO
* 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!
8.17.8
19-05-30
Feature
* #i0301: caddyNet.html without tax and net values for e-mail
Affected files:
* Configuration/TypoScript/Basis/Plugin/TxCaddyPi1
* _constants/html/width.ts
* templates
* email.ts
* Html/caddy.ts
* pdf.ts
New file:
* Resources/Private/Templates/E-Mail/caddyWoTaxNet.html
* #i0300: caddyWoTaxNet.html with net values
Affected files:
* Configuration/TypoScript
* Basis/Plugin/TxCaddyPi1/api/marker.ts
* Bootstrap
* 3x/tx_caddy_pi1/setup.ts
* 4x/tx_caddy_pi1/setup.ts
* Foundation
* 4x/setup.txt
* 5x/tx_caddy_pi1/setup.ts
* Resources/Private
* Language/Plugins/pi1
* de.locallang.xlf
* locallang.xlf
* Templates/Bootstrap
* 3x/caddyWoTaxNet.html
* 4x/caddyWoTaxNet.html
Newfiles:
* Resources/Private/Templates/Bootstrap
* 3x/caddyWoTaxNet.html
* 4x/caddyWoTaxNet.html
8.17.7
19-04-03
Bugfix
* #i0299: Powermail bug in mode concatenate Jss (strict mode):
Vraiable $activeTab is not defined.
Variable $activeTab is not defined.
Affected files:
* Configuration/TypoScript/Basis/page/includeJSFooter.ts
* Resources/Public/JavaScript/bugfixes.js
......
......@@ -12,9 +12,13 @@ plugin.caddy {
html.width.table.td.net = 15%
# cat=caddy - html - width//205; type=text; label= Width column sum: The width of the caddy column sum in HTML tables for CSS. Units can be px, em or % among others.
html.width.table.td.sum = 15%
# cat=caddy - html - width//301; type=text; label= Width 3 columns: The total width of the caddy columns sku, item and tax in HTML tables for CSS. Units can be px, em or % among others.
# cat=caddy - html - width//301; type=text; label= Width 2 columns: The total width of the caddy columns sku and item in HTML tables for CSS. Units can be px, em or % among others.
html.width.table.td.skuitem = 50%
# cat=caddy - html - width//302; type=text; label= Width 3 columns: The total width of the caddy columns sku, item and net in HTML tables for CSS. Units can be px, em or % among others.
html.width.table.td.skuitemnet = 65%
# cat=caddy - html - width//303; type=text; label= Width 3 columns: The total width of the caddy columns sku, item and tax in HTML tables for CSS. Units can be px, em or % among others.
html.width.table.td.skuitemtax = 60%
# cat=caddy - html - width//302; type=text; label= Width 4 columns: The total width of the caddy columns sku, item, tax and net in HTML tables for CSS. Units can be px, em or % among others.
# cat=caddy - html - width//304; type=text; label= Width 4 columns: The total width of the caddy columns sku, item, tax and net in HTML tables for CSS. Units can be px, em or % among others.
html.width.table.td.skuitemtaxnet = 75%
# cat=caddy - html - width/others/998; type=user[EXT:caddy/Classes/Lib/Userfunc/Userfunc.php:Netzmacher\Caddy\Lib\Userfunc\Userfunc->promptExternalLinks]; label=External Links:typo3-caddy.de
html.width.externalLinks = Click me!
......
......@@ -486,6 +486,15 @@ plugin.tx_caddy_pi1 {
field = sumsumqty
}
// Sum net over all
sumsumnet < .optionspaymentsumnet
sumsumnet.field = sumsumnet
// #i0151/#t1371, 170729, dwildt, ~
// Sum net for e-payment must be without currency
sumsumnetepayment = TEXT
sumsumnetepayment {
field = sumsumnet
}
// Sum gross over all
sumsumgross < .optionspaymentsumgross
sumsumgross.field = sumsumgross
......
......@@ -28,8 +28,10 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
}
}
......
......@@ -25,6 +25,8 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
......
......@@ -28,8 +28,10 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
}
// file, marker, table
......@@ -54,8 +56,10 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
}
// file, marker, table
......@@ -80,8 +84,10 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
}
// // file, marker, table
......@@ -106,8 +112,10 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
}
// #i0013, 130604, dwildt, + // file, marker, table
......@@ -132,8 +140,10 @@ plugin.tx_caddy_pi1 {
width_td_tax = {$plugin.caddy.html.width.table.td.tax}
width_td_net = {$plugin.caddy.html.width.table.td.net}
width_td_sum = {$plugin.caddy.html.width.table.td.sum}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
width_td_skuitem = {$plugin.caddy.html.width.table.td.skuitem}
width_td_skuitemnet = {$plugin.caddy.html.width.table.td.skuitemnet}
width_td_skuitemtax = {$plugin.caddy.html.width.table.td.skuitemtax}
width_td_skuitemtaxnet = {$plugin.caddy.html.width.table.td.skuitemtaxnet}
}
}
}
......
......@@ -146,8 +146,45 @@ plugin.tx_caddy_pi1 {
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.3}">|</span>
}
}
caddy_header_order = COA
caddy_header_order {
caddy_header_order_net = COA
caddy_header_order_net {
// label
10 = COA
10 {
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.0}">|</span>
// Amount
10 = TEXT
10 {
value = Amount
lang {
de = Summe
en = Amount
}
}
}
// &nbsp;
30 = TEXT
30 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.1}">|</span>
}
// value, currency
40 =
40 < plugin.tx_caddy.defaults.numberFormatCurrency
40 {
field = sumsumgross
value >
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.2}">|</span>
}
// &nbsp;
50 = TEXT
50 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.3}">|</span>
}
}
caddy_header_order_gross = COA
caddy_header_order_gross {
//wrap = <a href="#">|</a>
// label
10 = COA
......
......@@ -146,8 +146,45 @@ plugin.tx_caddy_pi1 {
wrap = <div class="{$plugin.caddy.html.accordion.classes.column.3}">|</div>
}
}
caddy_header_order = COA
caddy_header_order {
caddy_header_order_net = COA
caddy_header_order_net {
// label
10 = COA
10 {
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.0}">|</span>
// Amount
10 = TEXT
10 {
value = Amount
lang {
de = Summe
en = Amount
}
}
}
// &nbsp;
30 = TEXT
30 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.1}">|</span>
}
// value, currency
40 =
40 < plugin.tx_caddy.defaults.numberFormatCurrency
40 {
field = sumsumgross
value >
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.2}">|</span>
}
// &nbsp;
50 = TEXT
50 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.3}">|</span>
}
}
caddy_header_order_gross = COA
caddy_header_order_gross {
//wrap = <a href="#">|</a>
// label
10 = COA
......
......@@ -146,8 +146,45 @@ plugin.tx_caddy_pi1 {
wrap = <span class="small-1 large-1 columns">|</span>
}
}
caddy_header_order = COA
caddy_header_order {
caddy_header_order_net = COA
caddy_header_order_net {
// label
10 = COA
10 {
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.0}">|</span>
// Amount
10 = TEXT
10 {
value = Amount
lang {
de = Summe
en = Amount
}
}
}
// &nbsp;
30 = TEXT
30 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.1}">|</span>
}
// value, currency
40 =
40 < plugin.tx_caddy.defaults.numberFormatCurrency
40 {
field = sumsumgross
value >
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.2}">|</span>
}
// &nbsp;
50 = TEXT
50 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.3}">|</span>
}
}
caddy_header_order_gross = COA
caddy_header_order_gross {
wrap = <a href="#">|</a>
// label
10 = COA
......
......@@ -166,8 +166,45 @@ plugin.tx_caddy_pi1 {
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.3}">|</span>
}
}
caddy_header_order = COA
caddy_header_order {
caddy_header_order_net = COA
caddy_header_order_net {
// label
10 = COA
10 {
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.0}">|</span>
// Amount
10 = TEXT
10 {
value = Amount
lang {
de = Summe
en = Amount
}
}
}
// &nbsp;
30 = TEXT
30 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.1}">|</span>
}
// value, currency
40 =
40 < plugin.tx_caddy.defaults.numberFormatCurrency
40 {
field = sumsumgross
value >
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.2}">|</span>
}
// &nbsp;
50 = TEXT
50 {
value = &nbsp;
wrap = <span class="{$plugin.caddy.html.accordion.classes.column.3}">|</span>
}
}
caddy_header_order_gross = COA
caddy_header_order_gross {
//wrap = <a href="#">|</a>
// label
10 = COA
......
......@@ -215,6 +215,14 @@
<source>service option available until</source>
<target>verf&amp;uuml;gbar bis</target>
</trans-unit>
<trans-unit id="price_net_unit" xml:space="preserve" approved="yes">
<source>Price</source>
<target>Preis</target>
</trans-unit>
<trans-unit id="price_net_unit_wi_qty" xml:space="preserve" approved="yes">
<source>Sum</source>
<target>Gesamt</target>
</trans-unit>
<trans-unit id="price_gross_unit" xml:space="preserve" approved="yes">
<source>Price</source>
<target>Preis</target>
......
......@@ -215,6 +215,14 @@
<source>service option available until</source>
<target>verf&amp;uuml;gbar bis</target>
</trans-unit>
<trans-unit id="price_net_unit" xml:space="preserve" approved="yes">
<source>Price</source>
<target>Preis</target>
</trans-unit>
<trans-unit id="price_net_unit_wi_qty" xml:space="preserve" approved="yes">
<source>Sum</source>
<target>Gesamt</target>
</trans-unit>
<trans-unit id="price_gross_unit" xml:space="preserve" approved="yes">
<source>Price</source>
<target>Preis</target>
......
......@@ -175,7 +175,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title row">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#panel5">###_HTMLMARKER_CADDY_HEADER_ORDER###</a>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#panel5">###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###</a>
</h4>
</div>
<div id="panel5" class="black-on-white panel-collapse collapse###CADDY_SECTION_5###">
......
......@@ -176,7 +176,7 @@
<div class="">
<div class="panel-heading">
<h4 class="panel-title row">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion">###_HTMLMARKER_CADDY_HEADER_ORDER###</a>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion">###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###</a>
</h4>
</div>
<div id="amount" style="display:none;">###SUMSUMGROSSEPAYMENT###</div>
......
This diff is collapsed.
......@@ -189,7 +189,7 @@
<div class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
</div>
......
......@@ -190,7 +190,7 @@
<div class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
</div>
......
This diff is collapsed.
This diff is collapsed.
......@@ -168,7 +168,7 @@
<div class="section caddy-accordion###CADDY_SECTION_5###">
<div class="title" data-section-title>
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</div>
<div class="black-on-white content"data-section-content>
......
......@@ -162,7 +162,7 @@
<dd class="accordion-navigation###CADDY_SECTION_5###">
<a href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
<div id="panel5" class="black-on-white content###CADDY_SECTION_5###">
......
......@@ -168,7 +168,7 @@
<dd class="accordion-navigation###CADDY_SECTION_5###">
<a href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
<div id="panel5" class="content###CADDY_SECTION_5###">
......
......@@ -162,7 +162,7 @@
<dd class="accordion-navigation###CADDY_SECTION_5###">
<a href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
<div id="panel5" class="black-on-white content###CADDY_SECTION_5###">
......
......@@ -163,7 +163,7 @@
<dd class="accordion-navigation###CADDY_SECTION_5###">
<a href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
<div id="panel5" class="black-on-white content###CADDY_SECTION_5###">
......
......@@ -169,7 +169,7 @@
<dd class="accordion-navigation###CADDY_SECTION_5###">
<a href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
<div id="panel5" class="content###CADDY_SECTION_5###">
......
......@@ -163,7 +163,7 @@
<dd class="accordion-navigation###CADDY_SECTION_5###">
<a href="#panel5">
<div class="row">
###_HTMLMARKER_CADDY_HEADER_ORDER###
###_HTMLMARKER_CADDY_HEADER_ORDER_GROSS###
</div>
</a>
<div id="panel5" class="black-on-white content###CADDY_SECTION_5###">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment