Commit d1823607 authored by Dirk Wildt's avatar Dirk Wildt

8.16.0

parent a1b9eb8e
You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'AND `tx_caddy_order`.`deleted` = 0 GROUP BY LEFT( upper( tx_caddy_order.tstamp )' at line 1
SELECT tx_quickshop_pricevariant.*
FROM tx_quickshop_pricevariant
JOIN tx_quickshop_mm
ON (
tx_quickshop_mm.uid_local = 18
AND tx_quickshop_mm.table_local = 'tx_quickshop_products'
AND tx_quickshop_mm.table_foreign = 'tx_quickshop_pricevariant'
AND tx_quickshop_mm.uid_foreign = tx_quickshop_pricevariant.uid
);
SELECT COUNT( DISTINCT tx_caddy_order.uid ) AS 'count', LEFT( upper( tx_caddy_order.tstamp ), 1 ) AS 'initial' FROM tx_caddy_order WHERE AND `tx_caddy_order`.`deleted` = 0 GROUP BY LEFT( upper( tx_caddy_order.tstamp ), 1 ) ORDER BY LEFT( upper( tx_caddy_order.tstamp ), 1 )
SELECT *
FROM tx_quickshop_mm
WHERE (
tx_quickshop_mm.uid_local = 18
AND tx_quickshop_mm.table_local = 'tx_quickshop_products'
AND tx_quickshop_mm.table_foreign = 'tx_quickshop_pricevariant'
);
tx_browser_pi1_navi_indexBrowser::count_chars_resSqlCountDefLL (1336)
SELECT tx_quickshop_pricevariant.*
FROM tx_quickshop_pricevariant
JOIN tx_quickshop_mm
ON (
tx_quickshop_mm.uid_local = 16
AND tx_quickshop_mm.table_local = 'tx_quickshop_products'
AND tx_quickshop_mm.table_foreign = 'tx_quickshop_pricevariant'
AND tx_quickshop_mm.uid_foreign = tx_quickshop_pricevariant.uid
);
SELECT *
FROM tx_quickshop_mm
WHERE (
tx_quickshop_mm.uid_local = 16
AND tx_quickshop_mm.table_local = 'tx_quickshop_products'
AND tx_quickshop_mm.table_foreign = 'tx_quickshop_pricevariant'
);
SELECT '18' AS puid,
CONCAT('<strong>', tx_quickshop_products.title, '</strong><br />', tx_quickshop_pricevariant.title, ' ', tx_quickshop_pricevariant.value, ' &euro;') AS title,
tx_quickshop_pricevariant.value AS gross,
tx_quickshop_tax.value AS tax,
18 AS sku
FROM tx_quickshop_products
LEFT JOIN tx_quickshop_mm
ON (
tx_quickshop_mm.uid_local = tx_quickshop_products.uid
AND tx_quickshop_mm.table_local = 'tx_quickshop_products'
)
LEFT JOIN tx_quickshop_pricevariant
ON (
tx_quickshop_mm.uid_foreign = tx_quickshop_pricevariant.uid
AND tx_quickshop_mm.table_foreign = 'tx_quickshop_pricevariant'
AND tx_quickshop_pricevariant.uid = 200
AND (`tx_quickshop_pricevariant`.`deleted` = 0)
AND (`tx_quickshop_pricevariant`.`hidden` = 0)
)
LEFT JOIN tx_quickshop_tax
ON (
tx_quickshop_pricevariant.tx_quickshop_tax = tx_quickshop_tax.uid
AND (`tx_quickshop_tax`.`deleted` = 0)
AND (`tx_quickshop_tax`.`hidden` = 0)
AND (`tx_quickshop_tax`.`starttime` <= 1545341880)
AND ((`tx_quickshop_tax`.`endtime` = 0) OR (`tx_quickshop_tax`.`endtime` > 1545341880))
)
WHERE tx_quickshop_products.uid = 18
AND (`tx_quickshop_products`.`deleted` = 0)
AND (`tx_quickshop_products`.`hidden` = 0)
AND (`tx_quickshop_products`.`starttime` <= 1545341880)
AND ((`tx_quickshop_products`.`endtime` = 0) OR (`tx_quickshop_products`.`endtime` > 1545341880))
AND (
(
(`tx_quickshop_products`.`fe_group` = '')
OR (`tx_quickshop_products`.`fe_group` IS NULL)
OR (`tx_quickshop_products`.`fe_group` = '0')
OR (FIND_IN_SET('0', `tx_quickshop_products`.`fe_group`))
OR (FIND_IN_SET('-1', `tx_quickshop_products`.`fe_group`))
)
);
......@@ -3,9 +3,23 @@ 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.16.0
18-12-20
Feature
* #i0283: FLUIDTEMPLATE for the form "into the caddy"
New files:
* Configuration/TypoScript/Basis/Plugin/TxCaddyPi1
* _constants/variants.ts
* templates
* fluid/intoTheCaddy.ts
* Html/variant
* perItem/*
* perShop/*
* Resources/Private/View/Caddy/*
8.15.2
18-12-20
IMprovement
Improvement
* #i0282: Export property weight get a localised format
New TypoScript draft numberFormat
Affected files:
......
......@@ -2668,6 +2668,8 @@ class Session
$andWhere_ef = $cObj->enableFields( $str_efTable );
$query = str_replace( $str_efMarker, $andWhere_ef, $query );
}
//var_dump(__METHOD__, __LINE__, $query);
// #42154, 121203, dwildt, 1-
// $pObj->conf['db.']['sql'] = $query;
......
......@@ -19,5 +19,6 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/tax.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/templates.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/url.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/_constants/variants.ts">
plugin.caddy {
variants {
# cat=caddy - Variants//100; type=options[disabled,variantPerItem,variantPerShop]; label= Mode: diabled: No variants arent't used. variantPerItem: items have indvidual variants. variantPerShop: all items have the same variants.
mode = disabled
}
}
\ No newline at end of file
......@@ -2,4 +2,5 @@
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/caddymini.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/caddysum.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/Form/_setup.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/powermail.ts">
\ No newline at end of file
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/powermail.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/variant/_setup.ts">
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
// empty statement for proper comments only
html {
}
// variant
html =
html {
}
}
}
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/variant/perItem/_setup.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/variant/perShop/_setup.ts">
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
html {
// empty statement for proper comments only
variant {
}
// perItem
variant =
variant {
}
}
}
}
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/variant/perItem/options.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/variant/perItem/select.ts">
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
html {
variant {
// empty statement for proper comments only
perItem {
}
// options
perItem =
perItem {
options = COA
options {
10 = LOAD_REGISTER
10 {
// cObject.field = {$plugin.caddy.db.variants.tables.variant.title}
selectLabel =
selectLabel {
// field = {$plugin.caddy.db.variants.tables.variant.title}
cObject = TEXT
cObject {
field = {$plugin.caddy.db.variants.tables.variant.title}
}
}
}
// table = {$plugin.caddy.db.variants.tables.property}, select, renderObj
50 = CONTENT
50 {
table = {$plugin.caddy.db.variants.tables.property}
// pidInList = {$plugin.caddy.db.sysfolder}, where ..., orderBy {$plugin.caddy.db.variants.tables.property.sorting}
select =
select {
pidInList = {$plugin.caddy.db.sysfolder}
// field: uid = {$plugin.caddy.db.variants.relation.item2variant}
where =
where {
field = uid
intval = 1
noTrimWrap = |{$plugin.caddy.db.variants.relation.item2variant} = ||
}
orderBy = {$plugin.caddy.db.variants.tables.property.sorting}
}
// <option value="...">...</option>
renderObj = COA
renderObj {
// <option value="{field:uid}" {selected="selected"}>
20 = COA
20 {
// <option
20 = TEXT
20 {
value = <option
}
// value="{field:uid}"
30 = TEXT
30 {
field = uid
noTrimWrap = | value="|"|
}
// selected="selected", if is true field {$plugin.caddy.db.variants.tables.property.defaultvalue}
40 = TEXT
40 {
// if is true field {$plugin.caddy.db.variants.tables.property.defaultvalue}
if =
if {
isTrue {
field = {$plugin.caddy.db.variants.tables.property.defaultvalue}
}
}
value = selected="selected"
noTrimWrap = | ||
}
// >
50 = TEXT
50 {
value = >
}
}
// field = {$plugin.caddy.db.variants.tables.property.title}
30 = COA
30 {
// field = {$plugin.caddy.db.variants.tables.property.title}
10 = TEXT
10 {
data = register:selectLabel
noTrimWrap = ||: |
}
// field = {$plugin.caddy.db.variants.tables.property.title}
20 = TEXT
20 {
field = {$plugin.caddy.db.variants.tables.property.title}
}
}
// field = {$plugin.caddy.db.variants.tables.property.gross}
40 =
40 < plugin.tx_caddy.defaults.numberFormatCurrency
40 {
// if is true field plugin.caddy.db.variants.tables.property.gross (here: {$plugin.caddy.db.variants.tables.property.gross})
if =
if {
isTrue = {$plugin.caddy.db.variants.tables.property.gross}
}
field = {$plugin.caddy.db.variants.tables.property.gross}
value >
noTrimWrap = |<span class="gross"> (+|)</span>|
}
// </option>
90 = TEXT
90 {
value = </option>
}
}
}
}
}
}
}
}
}
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
html {
variant {
// empty statement for proper comments only
perItem {
}
// select
perItem =
perItem {
// Variants, if is true plugin.caddy.db.variants.tables.variant (here: {$plugin.caddy.db.variants.tables.variant})
select = COA
select {
// if is true plugin.caddy.db.variants.tables.variant (here: {$plugin.caddy.db.variants.tables.variant})
if =
if {
isTrue = {$plugin.caddy.db.variants.tables.variant}
}
10 = LOAD_REGISTER
10 {
perItemOptions =
perItemOptions {
// table = {$plugin.caddy.db.variants.tables.variant}
cObject = CONTENT
cObject {
table = {$plugin.caddy.db.variants.tables.variant}
// pidInList = {$plugin.caddy.db.sysfolder}, where {$plugin.caddy.db.variants.relation.variant2item} = GP:{$plugin.caddy.getpost.uid}
select =
select {
pidInList = {$plugin.caddy.db.sysfolder}
// {$plugin.caddy.db.variants.relation.variant2item} = GP:{$plugin.caddy.getpost.uid}
where =
where {
data = GP:{$plugin.caddy.getpost.uid}
intval = 1
noTrimWrap = |{$plugin.caddy.db.variants.relation.variant2item} = ||
}
}
renderObj < plugin.tx_caddy_pi1.templates.html.variant.perItem.options
}
}
}
// if.isTrue.data = register:perItemOptions: data = register:perItemOptions
20 = COA
20 {
// isTrue.data = register:perItemOptions
if =
if.isTrue.data = register:perItemOptions
wrap = <select name="{$plugin.caddy.db.variants.tables.property}[uid][]">|</select>
// <option></option>, if.isFalse.field {$plugin.caddy.db.variants.tables.variant.required}
10 = TEXT
10 {
// isFalse.field {$plugin.caddy.db.variants.tables.variant.required}
if =
if {
isFalse {
field = {$plugin.caddy.db.variants.tables.variant.required}
}
}
value = <option></option>
}
// data = register:perItemOptions
20 = TEXT
20 {
data = register:perItemOptions
}
}
}
}
}
}
}
}
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
html {
// empty statement for proper comments only
variant {
}
// perShop
variant =
variant {
}
}
}
}
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/variant/perShop/select.ts">
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
html {
variant {
// empty statement for proper comments only
perShop {
}
// select
perShop =
perShop {
// Variants, if is true plugin.caddy.db.variants.tables.variant (here: {$plugin.caddy.db.variants.tables.variant})
select = COA
select {
10 = LOAD_REGISTER
10 {
perShopOptions =
perShopOptions {
// table = {$plugin.tx_caddy_pi1.db.table}
cObject = CONTENT
cObject {
table = tx_quickshop_pricevariant
// pidInList = {$plugin.caddy.db.sysfolder}, where {$plugin.caddy.db.variants.relation.variant2item} = GP:{$plugin.caddy.getpost.uid}
select =
select {
pidInList = {$plugin.caddy.db.sysfolder}
// {$plugin.caddy.db.variants.relation.variant2item} = GP:{$plugin.caddy.getpost.uid}
join =
join {
data = GP:{$plugin.caddy.getpost.uid}
intval = 1
noTrimWrap = |tx_quickshop_mm ON (tx_quickshop_mm.uid_local = | AND tx_quickshop_mm.table_local = 'tx_quickshop_products' AND tx_quickshop_mm.table_foreign = 'tx_quickshop_pricevariant' AND tx_quickshop_mm.uid_foreign = tx_quickshop_pricevariant.uid)|
}
}
// <option value="{field:uid}">{field:title}</option>
renderObj = COA
renderObj {
// <option value="{field:uid}">
20 = TEXT
20 {
field = uid
noTrimWrap = |<option value="|">|
}
// {field:title}</option>
30 = TEXT
30 {
field = title
noTrimWrap = ||</option>|
}
}
}
}
}
// if.isTrue.data = register:perShopOptions: data = register:perShopOptions
20 = COA
20 {
// isTrue.data = register:perShopOptions
if =
if.isTrue.data = register:perShopOptions
wrap = <select id="tx_browser_pi1_tx_quickshop_pricevariant_uid" name="tx_quickshop_pricevariant[uid]">|</select>
// data = register:perShopOptions
20 = TEXT
20 {
data = register:perShopOptions
}
}
}
}
}
}
}
}
\ No newline at end of file
......@@ -2,11 +2,12 @@ plugin.tx_caddy_pi1 {
// empty statement for proper comments only
templates {
}
// e-mail, html, pdf
// e-mail, fluid, html, pdf
templates =
templates {
}
}
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/email.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/fluid/_setup.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/Html/_setup.ts">
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/pdf.ts">
\ No newline at end of file
<INCLUDE_TYPOSCRIPT: source="FILE:EXT:caddy/Configuration/TypoScript/Basis/Plugin/TxCaddyPi1/templates/fluid/intoTheCaddy.ts">
\ No newline at end of file
plugin.tx_caddy_pi1 {
templates {
// empty statement for proper comments only
fluid {
}
// intoTheCaddy
fluid =
fluid {
// templateName, layoutRootPaths, partialRootPaths, templateRootPaths, variables
intoTheCaddy = FLUIDTEMPLATE
intoTheCaddy {
templateName = IntoTheCaddy
// 10 = EXT:caddy/Resources/Private/View/Caddy/Layouts/ 20 = {$plugin.tx_caddy_pi1.view.intoTheCaddy.layoutRootPath}
layoutRootPaths =
layoutRootPaths {
10 = EXT:caddy/Resources/Private/View/Caddy/Layouts/
20 = {$plugin.tx_caddy_pi1.view.intoTheCaddy.layoutRootPath}
}
// 10 = EXT:caddy/Resources/Private/View/Caddy/Partials/ 20 = {$plugin.tx_caddy_pi1.view.intoTheCaddy.partialRootPaths}
partialRootPaths =
partialRootPaths {
10 = EXT:caddy/Resources/Private/View/Caddy/Partials/
20 = {$plugin.tx_caddy_pi1.view.intoTheCaddy.partialRootPaths}
}
// 10 = EXT:caddy/Resources/Private/View/Caddy/Templates/ 20 = {$plugin.tx_caddy_pi1.view.intoTheCaddy.templateRootPaths}
templateRootPaths =
templateRootPaths {
10 = EXT:caddy/Resources/Private/View/Caddy/Templates/
20 = {$plugin.tx_caddy_pi1.view.intoTheCaddy.templateRootPaths}
}
// caddyPid, formButtonSubmit, formFieldsetLabel, itemUid, variantMode
variables =
variables {
// value = {$plugin.caddy.pages.caddy}
caddyPid = TEXT
caddyPid {
value = {$plugin.caddy.pages.caddy}
}
// <button ...>...</button>
formButtonSubmit = TEXT
formButtonSubmit {
data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:formButton
wrap = <button class="{$plugin.caddy.html.intothecaddy.button.classes.wiselect}" role="button "><span class="{$plugin.caddy.html.intothecaddy.icon.class}" style="font-size:1.8em;top:0.1em;position:relative;"></span>&nbsp; |</button>
}
// data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:formLegend
formFieldsetLabel = TEXT
formFieldsetLabel {
data = LLL:EXT:caddy/Resources/Private/Language/Plugins/pi1/locallang.xlf:formLegend
}
// value = {$plugin.caddy.getpost.qty}
formInputHiddenQuantity = TEXT
formInputHiddenQuantity {
value = {$plugin.caddy.getpost.qty}
}
// value = {$plugin.caddy.html.intothecaddy.form.select}
formSelectEnabled = TEXT
formSelectEnabled {
value = {$plugin.caddy.html.intothecaddy.form.select}
}
// field = {$plugin.caddy.db.table}.uid
itemUid = TEXT
itemUid {
field = {$plugin.caddy.db.table}.uid
}
// field = {$plugin.caddy.db.table}.{$plugin.caddy.db.service_attribute_1}
serviceAttributeLocaltable01 = TEXT
serviceAttributeLocaltable01 {
field = {$plugin.caddy.db.table}.{$plugin.caddy.db.service_attribute_1}
}
// field = {$plugin.caddy.db.table}.{$plugin.caddy.db.service_attribute_2}
serviceAttributeLocaltable02 = TEXT
serviceAttributeLocaltable02 {
field = {$plugin.caddy.db.table}.{$plugin.caddy.db.service_attribute_2}
}
// field = {$plugin.caddy.db.table}.{$plugin.caddy.db.service_attribute_3}
serviceAttributeLocaltable03 = TEXT
serviceAttributeLocaltable03 {
field = {$plugin.caddy.db.table}.{$plugin.caddy.db.service_attribute_3}
}
// field = {$plugin.caddy.db.service_attribute_1}
serviceAttributeForeigntable01 = TEXT
serviceAttributeForeigntable01 {
field = {$plugin.caddy.db.service_attribute_1}
}
// field = {$plugin.caddy.db.service_attribute_2}
serviceAttributeForeigntable02 = TEXT
serviceAttributeForeigntable02 {
field = {$plugin.caddy.db.service_attribute_2}
}
// field = {$plugin.caddy.db.service_attribute_3}
serviceAttributeForeigntable03 = TEXT
serviceAttributeForeigntable03 {
field = {$plugin.caddy.db.service_attribute_3}
}
// value = {$plugin.caddy.url.extension}
urlExtension = TEXT
urlExtension {
value = {$plugin.caddy.url.extension}
}
// value = {$plugin.quick_shop.variants.mode}
variantMode = TEXT
variantMode {
value = {$plugin.caddy.variants.mode}
}
}
}
}
}
}
\ No newline at end of file
......@@ -24,7 +24,7 @@ Attachments for
* terms & conditions
will generated on the fly. See :ref:`Plugin > Caddy <users-setup-plugins-caddy>`
will generated on the fly. See :ref:`Users > Setup > Caddy <users_setup_caddy>`
But if there is a need, to attach another file, you can attach it.
......
......@@ -28,7 +28,7 @@ will generated on the fly.
You are controlling attachments by the Caddy plugin.
See :ref:`Plugin > Caddy <users-setup-plugins-caddy>`
See :ref:`Users > Setup > Caddy <users_setup_caddy>`
But if there is a need, to attach another file, you can attach it.
......
......@@ -6,7 +6,7 @@
.. include:: ../../../../../Includes.txt
.. _users-setup-plugins-workflow:
.. _users_setup_workflow:
Workflow
========
......
[general]
copyright = 2013-2018
project = Caddy - responsive Shopping Cart
release = 8.15.1
release = 8.15.2
version = 8.15
[html_theme_options]
......
......@@ -7,7 +7,7 @@ conf.py:
copyright: 2013-2018
project: Caddy - responsive Shopping Cart
version: 8.15
release: 8.15.1
release: 8.15.2
latex_documents:
- - Index
- caddy.tex
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../Includes.txt
.. _users-setup-plugins-caddy:
.. _users_setup_caddy:
Caddy
=====
......
......@@ -3,10 +3,10 @@
.. --------------------------------------------------
.. -*- coding: utf-8 -*- with BOM.
.. include:: ../../../../Includes.txt
.. include:: ../../../Includes.txt
.. _users-setup-plugins-export:
.. _users_setup_export:
Export
......
......@@ -12,12 +12,19 @@
Setup
=======
Index
-----
.. toctree::
:maxdepth: 3
:titlesonly:
Plugins/Index
\ No newline at end of file
Caddy/Index
Minicaddy/Index
Export/Index
Powermail/Index
Manual 6.3.3
------------
Sorry, the current manual isn't complete. Please refer to the former manual too:
* `Caddy (manual 6.3.3)`_
\ No newline at end of file