Commit 721b525d authored by Dirk Wildt's avatar Dirk Wildt

8.15.1

parent 334ff1fa
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 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 )
tx_browser_pi1_navi_indexBrowser::count_chars_resSqlCountDefLL (1336)
......@@ -3,6 +3,26 @@ 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.15.1
18-12-19
Feature
* #i0281: Extended export with
* weight of items
Affected files:
* Classes
* Lib/Caddy/Calcsum.php
* Plugins/pi1/Clean.php
* #i0280: Extended order record with
* customer id (in progress)
* weight of items
Affected files:
* Configuration/TCA
* 7.6/tx_caddy_order.php
* 8.7/tx_caddy_order.php
* Resources/Private/Language
* de.locallang_db.xlf
* locallang_db.xlf
* ext_tables.sql
8.15.0
18-12-19
Feature
......@@ -27,6 +47,9 @@ TODO
* Foundation
* 4x/caddymini.html
* 5x/caddymini.html
Improvement
* #i0279: CSS filter for bootstrap 3x/4x. Affected file:
* Configuration/TypoScript/Browser/Export/162/tx_browser_pi1/list/htmlSnippets.ts
8.14.4
18-12-18
......
......@@ -762,7 +762,7 @@ class Calcsum
* @param array $sumCashdiscount :
* @return array $sum (see above)
* @access private
* @version 2.0.2
* @version 8.15.1
* @since 2.0.2
*/
private function sumSum( $items, $options, $sumCashdiscount )
......@@ -774,6 +774,8 @@ class Calcsum
'gross' => $this->sumSumGross( $items, $options ) + $sumCashdiscount[ 'sum' ][ 'gross' ],
'net' => $this->sumSumNet( $items, $options ) + $sumCashdiscount[ 'sum' ][ 'net' ],
'tax' => $this->sumSumTax( $items, $options, $sumCashdiscount[ 'sum' ] ),
// #i0281. 191218, dwildt, 1+
'weight' => $this->sumSumWeight(),
);
return $sum;
......@@ -897,4 +899,26 @@ class Calcsum
return $sum;
}
}
\ No newline at end of file
/**
* sumSumWeight( ) :
*
* @return integer
* @access private
* @internal #
* @version 8.15.1
* @since 8.15.1
*/
private function sumSumWeight()
{
$sumSumWeight = 0;
$products = $this->session->productsGet( $this->pidCaddy );
foreach( ( array ) $products as $product )
{
$sumSumWeight = $sumSumWeight + ( $product[ 'weight' ] * $product[ 'qty' ]);
}
return $sumSumWeight;
}
}
......@@ -31,7 +31,7 @@ namespace Netzmacher\Caddy\Plugins\pi1;
* @author Dirk Wildt <http://wildt.at.die-netzmacher.de>
* @package TYPO3
* @subpackage tx_caddy
* @version 7.3.0
* @version 8.15.1
* @since 1.4.6
*/
class Clean
......@@ -365,7 +365,7 @@ class Clean
* @param array $sesArray :
* @return void
* @access private
* @version 2.0.2
* @version 8.15.1
* @since 2.0.2
*/
private function _databaseFieldsSum( $sesArray )
......@@ -376,6 +376,8 @@ class Clean
'sumNet' => $sesArray[ 'sum' ][ 'sum' ][ 'net' ],
'sumTaxNormal' => $sesArray[ 'sum' ][ 'sum' ][ 'tax' ][ 'normal' ],
'sumTaxReduced' => $sesArray[ 'sum' ][ 'sum' ][ 'tax' ][ 'reduced' ],
// #i0281, 191218, dwildt, 1+
'sumWeight' => $sesArray[ 'sum' ][ 'sum' ][ 'weight' ],
);
// Set record
......
......@@ -29,6 +29,7 @@ $tx_caddy_order = array(
. 'customerDebitBic,customerDebitIban,customerDebitOwner,'
. 'customerDeliveryorderAddress,customerDeliveryorderCity,customerDeliveryorderCompany,customerDeliveryorderCountry,customerDeliveryorderFirstname,customerDeliveryorderLastname,customerDeliveryorderZip,'
. 'customerInvoiceAddress,customerInvoiceCity,customerInvoiceCompany,customerInvoiceCountry,customerInvoiceFirstname,customerInvoiceLastname,customerInvoiceZip,'
. 'customerUid,'
. 'fileDeliveryorder,fileInvoice,fileOrderconfirmation,fileRevocation,fileTerms,'
. 'numberDeliveryorder,numberInvoice,numberOrder,'
. 'pdfDeliveryorderToCustomer,pdfDeliveryorderToVendor,'
......@@ -38,7 +39,7 @@ $tx_caddy_order = array(
. 'pdfTermsToCustomer,pdfTermsToVendor,'
. 'quantity,'
. 'statisticValue01,'
. 'sumGross,sumNet,sumTaxReduced,sumTaxNormal,'
. 'sumGross,sumNet,sumWeight,sumTaxReduced,sumTaxNormal,'
. 'tstamp,'
. 'tx_caddy_item'
),
......@@ -49,6 +50,7 @@ $tx_caddy_order = array(
. 'customerDebitBic,customerDebitIban,customerDebitOwner,'
. 'customerDeliveryorderAddress,customerDeliveryorderCity,customerDeliveryorderCompany,customerDeliveryorderCountry,customerDeliveryorderFirstname,customerDeliveryorderLastname,customerDeliveryorderZip,'
. 'customerInvoiceAddress,customerInvoiceCity,customerInvoiceCompany,customerInvoiceCountry,customerInvoiceFirstname,customerInvoiceLastname,customerInvoiceZip,'
. 'customerUid,'
. 'fileDeliveryorder,fileInvoice,fileOrderconfirmation,fileRevocation,fileTerms,'
. 'numberDeliveryorder,numberInvoice,numberOrder,'
. 'pdfDeliveryorderToCustomer,pdfDeliveryorderToVendor,'
......@@ -58,7 +60,7 @@ $tx_caddy_order = array(
. 'pdfTermsToCustomer,pdfTermsToVendor,'
. 'quantity,'
. 'statisticValue01,'
. 'sumGross,sumNet,sumTaxReduced,sumTaxNormal,'
. 'sumGross,sumNet,sumWeight,sumTaxReduced,sumTaxNormal,'
. 'tstamp,'
. 'tx_caddy_item'
,
......@@ -226,6 +228,15 @@ $tx_caddy_order = array(
'eval' => '',
)
),
'customerUid' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerUid',
'config' => array(
'type' => 'input',
'size' => '40',
'eval' => '',
)
),
'fileDeliveryorder' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.fileDeliveryorder',
......@@ -443,6 +454,15 @@ $tx_caddy_order = array(
'eval' => 'double2,nospace',
)
),
'sumWeight' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumWeight',
'config' => array(
'type' => 'input',
'size' => '10',
'eval' => 'double2,nospace',
)
),
'sumTaxNormal' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumTaxNormal',
......@@ -585,6 +605,7 @@ $tx_caddy_order = array(
'invoice' => array(
'showitem' => ''
. 'customerInvoiceCompany;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerInvoiceCompany,'
. 'customerUid,'
. '--linebreak--,'
. 'customerInvoiceFirstname;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerInvoiceFirstname,'
. 'customerInvoiceLastname;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerInvoiceLastname,'
......@@ -634,6 +655,10 @@ $tx_caddy_order = array(
),
'sum' => array(
'showitem' => ''
. 'quantity;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.quantity,'
. '--linebreak--,'
. 'sumWeight,'
. '--linebreak--,'
. 'sumNet;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumNet,'
. '--linebreak--,'
. 'sumTaxReduced;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumTaxReduced,'
......
......@@ -29,6 +29,7 @@ $tx_caddy_order = array(
. 'customerDebitBic,customerDebitIban,customerDebitOwner,'
. 'customerDeliveryorderAddress,customerDeliveryorderCity,customerDeliveryorderCompany,customerDeliveryorderCountry,customerDeliveryorderFirstname,customerDeliveryorderLastname,customerDeliveryorderZip,'
. 'customerInvoiceAddress,customerInvoiceCity,customerInvoiceCompany,customerInvoiceCountry,customerInvoiceFirstname,customerInvoiceLastname,customerInvoiceZip,'
. 'customerUid,'
. 'fileDeliveryorder,fileInvoice,fileOrderconfirmation,fileRevocation,fileTerms,'
. 'numberDeliveryorder,numberInvoice,numberOrder,'
. 'pdfDeliveryorderToCustomer,pdfDeliveryorderToVendor,'
......@@ -38,7 +39,7 @@ $tx_caddy_order = array(
. 'pdfTermsToCustomer,pdfTermsToVendor,'
. 'quantity,'
. 'statisticValue01,'
. 'sumGross,sumNet,sumTaxReduced,sumTaxNormal,'
. 'sumGross,sumNet,sumWeight,sumTaxReduced,sumTaxNormal,'
. 'tstamp,'
. 'tx_caddy_item'
),
......@@ -49,6 +50,7 @@ $tx_caddy_order = array(
. 'customerDebitBic,customerDebitIban,customerDebitOwner,'
. 'customerDeliveryorderAddress,customerDeliveryorderCity,customerDeliveryorderCompany,customerDeliveryorderCountry,customerDeliveryorderFirstname,customerDeliveryorderLastname,customerDeliveryorderZip,'
. 'customerInvoiceAddress,customerInvoiceCity,customerInvoiceCompany,customerInvoiceCountry,customerInvoiceFirstname,customerInvoiceLastname,customerInvoiceZip,'
. 'customerUid,'
. 'fileDeliveryorder,fileInvoice,fileOrderconfirmation,fileRevocation,fileTerms,'
. 'numberDeliveryorder,numberInvoice,numberOrder,'
. 'pdfDeliveryorderToCustomer,pdfDeliveryorderToVendor,'
......@@ -58,7 +60,7 @@ $tx_caddy_order = array(
. 'pdfTermsToCustomer,pdfTermsToVendor,'
. 'quantity,'
. 'statisticValue01,'
. 'sumGross,sumNet,sumTaxReduced,sumTaxNormal,'
. 'sumGross,sumNet,sumWeight,sumTaxReduced,sumTaxNormal,'
. 'tstamp,'
. 'tx_caddy_item'
,
......@@ -226,6 +228,15 @@ $tx_caddy_order = array(
'eval' => '',
)
),
'customerUid' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerUid',
'config' => array(
'type' => 'input',
'size' => '40',
'eval' => '',
)
),
'fileDeliveryorder' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.fileDeliveryorder',
......@@ -438,6 +449,15 @@ $tx_caddy_order = array(
'eval' => 'double2,nospace',
)
),
'sumWeight' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumWeight',
'config' => array(
'type' => 'input',
'size' => '10',
'eval' => 'double2,nospace',
)
),
'sumTaxNormal' => array(
'exclude' => 0,
'label' => 'LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumTaxNormal',
......@@ -579,6 +599,7 @@ $tx_caddy_order = array(
'invoice' => array(
'showitem' => ''
. 'customerInvoiceCompany;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerInvoiceCompany,'
. 'customerUid,'
. '--linebreak--,'
. 'customerInvoiceFirstname;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerInvoiceFirstname,'
. 'customerInvoiceLastname;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.customerInvoiceLastname,'
......@@ -630,6 +651,8 @@ $tx_caddy_order = array(
'showitem' => ''
. 'quantity;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.quantity,'
. '--linebreak--,'
. 'sumWeight,'
. '--linebreak--,'
. 'sumNet;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumNet,'
. '--linebreak--,'
. 'sumTaxReduced;LLL:EXT:caddy/Resources/Private/Language/locallang_db.xlf:tx_caddy_order.sumTaxReduced,'
......
......@@ -9,13 +9,13 @@ plugin.tx_browser_pi1 {
filter {
value (
<div class="row filter">
<div class="columns small-12 medium-4 selectbox">
<div class="col columns small-12 medium-4 col-md-4selectbox">
###TX_CADDY_ORDER.TSTAMP###
</div>
<div class="columns small-12 medium-4 selectbox">
<div class="col columns small-12 medium-4 col-md-4selectbox">
###TX_CADDY_ORDER.CUSTOMEREMAIL###
</div>
<div class="columns small-12 medium-4 selectbox">
<div class="col columns small-12 medium-4 col-md-4selectbox">
###TX_CADDY_ORDER.NUMBERORDER###
</div>
</div>
......
......@@ -8,6 +8,7 @@ plugin.tx_browser_pi1 {
tx_caddy_order.numberDeliveryorder,
tx_caddy_order.numberInvoice,
tx_caddy_order.numberOrder,
tx_caddy_order.customerUid,
tx_caddy_order.customerInvoiceCompany,
tx_caddy_order.customerInvoiceFirstname,
tx_caddy_order.customerInvoiceLastname,
......@@ -16,6 +17,7 @@ plugin.tx_browser_pi1 {
tx_caddy_order.customerInvoiceCity,
tx_caddy_order.customerInvoiceCountry,
tx_caddy_order.quantity,
tx_caddy_order.sumWeight,
tx_caddy_order.sumNet,
tx_caddy_order.sumGross,
tx_caddy_order.sumTaxNormal,
......
......@@ -191,6 +191,10 @@
<source>Zip</source>
<target>PLZ</target>
</trans-unit>
<trans-unit id="tx_caddy_order.customerUid" xml:space="preserve" approved="yes">
<source>Customer Id</source>
<target>Kundennummer</target>
</trans-unit>
<trans-unit id="tx_caddy_order.div.account" xml:space="preserve" approved="yes">
<source>Bank account</source>
<target>Bankkonto</target>
......@@ -343,6 +347,10 @@
<source>gross</source>
<target>Brutto</target>
</trans-unit>
<trans-unit id="tx_caddy_order.sumWeight" xml:space="preserve" approved="yes">
<source>overall weight</source>
<target>Gesamtgewicht</target>
</trans-unit>
<trans-unit id="tx_caddy_order.sumTaxNormal" xml:space="preserve" approved="yes">
<source>tax (normal)</source>
<target>MwSt. (normal)</target>
......
This diff is collapsed.
......@@ -63,6 +63,7 @@ CREATE TABLE tx_caddy_order (
customerInvoiceFirstname tinytext,
customerInvoiceLastname tinytext,
customerInvoiceZip tinytext,
customerUid tinytext,
fileDeliveryorder tinytext,
fileInvoice tinytext,
......@@ -91,6 +92,7 @@ CREATE TABLE tx_caddy_order (
sumNet double(11,2) DEFAULT '0.00' NOT NULL,
sumGross double(11,2) DEFAULT '0.00' NOT NULL,
sumWeight double(11,2) DEFAULT '0.00' NOT NULL,
sumTaxNormal double(11,2) DEFAULT '0.00' NOT NULL,
sumTaxReduced double(11,2) DEFAULT '0.00' NOT NULL,
......
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