Commit b5f7dcfe authored by Dirk Wildt's avatar Dirk Wildt

8.17.0

parent ab28a5f9
......@@ -61,7 +61,10 @@ TODO
* Public/Css/2.0.0/caddy.css
Improvements
* #i0287: (c) 2019
Bugfix
* #i0289: Shipping options are broken, if Quick Shop template DHL for caddy is loaded before the Caddy templates.
Affected file:
* Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/api/options/shipping.ts
8.16.2
18-12-30
Bugfix
......
......@@ -2717,11 +2717,15 @@ class Caddy extends \Netzmacher\Caddy\AbstractPlugin
*/
private function optionListConditionNotEach( $optionType, $conf )
{
// var_dump( __METHOD__, __LINE__, $this->products );
$content = null;
$unit = $this->optionListSymbolByExtra( $conf[ 'extra' ] );
$extras = ( array ) $conf[ 'extra.' ];
if( empty( $extras ) )
{
return;
}
$unit = $this->optionListSymbolByExtra( $conf[ 'extra' ] );
$tmpl = $this->tmpl[ $optionType . '_condition_item' ];
foreach( ( array ) $extras as $extra )
......
......@@ -46,66 +46,66 @@ plugin.tx_caddy_pi1 {
tax = {$plugin.caddy.options.shipping.1.taxrate}
}
// mailexpress: enabled, title, extra, tax
2 < .1
2 =
2 {
enabled = {$plugin.caddy.options.shipping.2.enabled}
// label, gross
title = COA
title {
10 = TEXT
10 {
data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:shippingoption_mailexpress
noTrimWrap = || |
}
// amount
20 =
20 < plugin.tx_caddy.defaults.numberFormatCurrency
20 {
if {
value = 0
isGreaterThan = {$plugin.caddy.options.shipping.2.costs}
}
value = {$plugin.caddy.options.shipping.2.costs}
stdWrap {
noTrimWrap = |(+| {$plugin.caddy.main.currencySymbol})|
}
}
# 20 {
# if {
# isGreaterThan = {$plugin.caddy.options.shipping.2.costs}
# }
# 10 {
# userFunc {
# number {
# value = {$plugin.caddy.options.shipping.2.costs}
# }
# }
# }
# }
}
// extra cost (gross price) of payment method
extra = {$plugin.caddy.options.shipping.2.costs}
tax = {$plugin.caddy.options.shipping.2.taxrate}
// tax rate which will be applied (reduced or normal)
tax = {$plugin.caddy.options.shipping.2.taxrate}
}
// pick up: enabled, title, extra, tax
3 < .1
3 =
3 {
enabled = {$plugin.caddy.options.shipping.3.enabled}
// label, gross
title = COA
title {
10 = TEXT
10 {
data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:shippingoption_pickup
noTrimWrap = || |
}
// amount
20 =
20 < plugin.tx_caddy.defaults.numberFormatCurrency
20 {
if {
value = 0
isGreaterThan = {$plugin.caddy.options.shipping.3.costs}
}
value = {$plugin.caddy.options.shipping.3.costs}
stdWrap {
noTrimWrap = |(+| {$plugin.caddy.main.currencySymbol})|
}
}
# 20 {
# if {
# isGreaterThan = {$plugin.caddy.options.shipping.3.costs}
# }
# 10 {
# userFunc {
# number {
# value = {$plugin.caddy.options.shipping.3.costs}
# }
# }
# }
# }
}
// extra cost (gross price) of payment method
extra = {$plugin.caddy.options.shipping.3.costs}
tax = {$plugin.caddy.options.shipping.3.taxrate}
// tax rate which will be applied (reduced or normal)
tax = {$plugin.caddy.options.shipping.3.taxrate}
}
}
}
......
......@@ -203,6 +203,29 @@
<!-- ###CADDY_ITEM_ERROR### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE### begin -->
<div id="caddy_insurance">
<fieldset>
<legend>###_LOCAL_LANG_INSURANCELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###INSURANCE_RADIO### ###INSURANCE_TITLE### ###INSURANCE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_INSURANCE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE_CONDITIONS### begin -->
<ul class="caddy_insurance_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_INSURANCE_CONDITIONS### end -->
<!-- ###CADDY_PAYMENT### begin -->
<div id="caddy_payment">
<fieldset>
......@@ -224,6 +247,29 @@
<!-- ###CADDY_PAYMENT_CONDITIONS### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE### begin -->
<div id="caddy_recyclingfee">
<fieldset>
<legend>###_LOCAL_LANG_RECYCLINGFEELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###RECYCLINGFEE_RADIO### ###RECYCLINGFEE_TITLE### ###RECYCLINGFEE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_RECYCLINGFEE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### begin -->
<ul class="caddy_recyclingfee_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### end -->
<!-- ###CADDY_SHIPPING### begin -->
<div id="caddy_shipping">
<fieldset>
......
......@@ -200,6 +200,29 @@
<!-- ###CADDY_ITEM_ERROR### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE### begin -->
<div id="caddy_insurance">
<fieldset>
<legend>###_LOCAL_LANG_INSURANCELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###INSURANCE_RADIO### ###INSURANCE_TITLE### ###INSURANCE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_INSURANCE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE_CONDITIONS### begin -->
<ul class="caddy_insurance_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_INSURANCE_CONDITIONS### end -->
<!-- ###CADDY_PAYMENT### begin -->
<div id="caddy_payment">
<fieldset>
......@@ -221,6 +244,29 @@
<!-- ###CADDY_PAYMENT_CONDITIONS### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE### begin -->
<div id="caddy_recyclingfee">
<fieldset>
<legend>###_LOCAL_LANG_RECYCLINGFEELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###RECYCLINGFEE_RADIO### ###RECYCLINGFEE_TITLE### ###RECYCLINGFEE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_RECYCLINGFEE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### begin -->
<ul class="caddy_recyclingfee_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### end -->
<!-- ###CADDY_SHIPPING### begin -->
<div id="caddy_shipping">
<fieldset>
......
......@@ -219,6 +219,29 @@
<!-- ###CADDY_ITEM_ERROR### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE### begin -->
<div id="caddy_insurance">
<fieldset>
<legend>###_LOCAL_LANG_INSURANCELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###INSURANCE_RADIO### ###INSURANCE_TITLE### ###INSURANCE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_INSURANCE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE_CONDITIONS### begin -->
<ul class="caddy_insurance_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_INSURANCE_CONDITIONS### end -->
<!-- ###CADDY_PAYMENT### begin -->
<div id="caddy_payment">
<fieldset>
......@@ -240,6 +263,29 @@
<!-- ###CADDY_PAYMENT_CONDITIONS### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE### begin -->
<div id="caddy_recyclingfee">
<fieldset>
<legend>###_LOCAL_LANG_RECYCLINGFEELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###RECYCLINGFEE_RADIO### ###RECYCLINGFEE_TITLE### ###RECYCLINGFEE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_RECYCLINGFEE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### begin -->
<ul class="caddy_recyclingfee_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### end -->
<!-- ###CADDY_SHIPPING### begin -->
<div id="caddy_shipping">
<fieldset>
......
......@@ -216,6 +216,29 @@
<!-- ###CADDY_ITEM_ERROR### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE### begin -->
<div id="caddy_insurance">
<fieldset>
<legend>###_LOCAL_LANG_INSURANCELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###INSURANCE_RADIO### ###INSURANCE_TITLE### ###INSURANCE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_INSURANCE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_INSURANCE_CONDITIONS### begin -->
<ul class="caddy_insurance_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_INSURANCE_CONDITIONS### end -->
<!-- ###CADDY_PAYMENT### begin -->
<div id="caddy_payment">
<fieldset>
......@@ -237,6 +260,29 @@
<!-- ###CADDY_PAYMENT_CONDITIONS### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE### begin -->
<div id="caddy_recyclingfee">
<fieldset>
<legend>###_LOCAL_LANG_RECYCLINGFEELABEL###</legend>
<!-- ###CONTENT### --><!-- ###ITEM### -->
<div class="radio caddy_fieldwrap_radio">###RECYCLINGFEE_RADIO### ###RECYCLINGFEE_TITLE### ###RECYCLINGFEE_CONDITION###</div>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</fieldset>
</div>
<!-- ###CADDY_RECYCLINGFEE### end -->
<!--#i0286 190121, dwildt, +-->
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### begin -->
<ul class="caddy_recyclingfee_conditions">
<!-- ###CONTENT### --><!-- ###ITEM### -->
<li>###CONDITION###</li>
<!-- ###ITEM### --><!-- ###CONTENT### -->
</ul>
<!-- ###CADDY_RECYCLINGFEE_CONDITIONS### end -->
<!-- ###CADDY_SHIPPING### begin -->
<div id="caddy_shipping">
<fieldset>
......
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