From 2f1c2567795c6c1fa87fd1efdcf54b54bdf08836 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Tue, 30 Jun 2020 22:21:27 +0200 Subject: [PATCH] add auto colon suffix --- .../translations/de/pdfdocuments_lang.php | 2 ++ .../translations/en/pdfdocuments_lang.php | 22 ++++++++++--------- .../deliverynote/inc/informations.tpl | 2 +- .../documents/deliverynote/inc/salutation.tpl | 2 +- .../inc/elements/articlecostssummary.tpl | 14 ++++++------ .../inc/elements/deliveryaddress.tpl | 2 +- .../documents/inc/elements/informations.tpl | 10 ++++----- .../views/tpl/documents/inc/page/footer.tpl | 12 +++++----- .../tpl/documents/invoice/inc/conclusion.tpl | 2 +- .../documents/invoice/inc/informations.tpl | 8 +++---- .../tpl/documents/invoice/inc/salutation.tpl | 2 +- 11 files changed, 41 insertions(+), 37 deletions(-) diff --git a/Application/translations/de/pdfdocuments_lang.php b/Application/translations/de/pdfdocuments_lang.php index 9f74463..b12c04e 100644 --- a/Application/translations/de/pdfdocuments_lang.php +++ b/Application/translations/de/pdfdocuments_lang.php @@ -35,6 +35,8 @@ $aLang = array( 'D3_PDFDOCUMENTS_DATE_FORMAT' => '%d.%m.%Y', 'D3_PDFDOCUMENTS_USTIDNR' => 'Ust.-ID-Nr.', + 'D3_PDFDOCUMENTS_DELIVERYADDRESS' => 'Lieferadresse', + 'D3_PDFDOCUMENTS_INVOICE' => 'Rechnung', 'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Lieferschein', 'D3_PDFDOCUMENTS_ORDERNR' => 'Bestellnr.', diff --git a/Application/translations/en/pdfdocuments_lang.php b/Application/translations/en/pdfdocuments_lang.php index 46ca118..c686251 100644 --- a/Application/translations/en/pdfdocuments_lang.php +++ b/Application/translations/en/pdfdocuments_lang.php @@ -22,21 +22,23 @@ $aLang = array( 'D3_PDFDOCUMENTS_GET_IN_CONTACT' => 'You can contact us as follows', 'D3_PDFDOCUMENTS_TELEFON' => 'Telephone', 'D3_PDFDOCUMENTS_FAX' => 'Fax', - 'D3_PDFDOCUMENTS_EMAIL' => 'email', + 'D3_PDFDOCUMENTS_EMAIL' => 'Email', - 'D3_PDFDOCUMENTS_BANK_ACCOUNT' => 'Bank account', + 'D3_PDFDOCUMENTS_BANK_ACCOUNT' => 'Bank Account', 'D3_PDFDOCUMENTS_BANK_ACCOUNTNR' => 'IBAN', 'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER' => 'BIC', - 'D3_PDFDOCUMENTS_ORDERBILLNR' => 'Invoice no.', - 'D3_PDFDOCUMENTS_CUSTOMERNR' => 'Customer no.', + 'D3_PDFDOCUMENTS_ORDERBILLNR' => 'Invoice No.', + 'D3_PDFDOCUMENTS_CUSTOMERNR' => 'Customer No.', 'D3_PDFDOCUMENTS_DATE' => 'Date', 'D3_PDFDOCUMENTS_DATE_FORMAT' => '%Y-%m-%d', - 'D3_PDFDOCUMENTS_USTIDNR' => 'VAT ID no.', + 'D3_PDFDOCUMENTS_USTIDNR' => 'VAT ID No.', + + 'D3_PDFDOCUMENTS_DELIVERYADDRESS' => 'Shipping Address', 'D3_PDFDOCUMENTS_INVOICE' => 'Invoice', 'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Deliverynote', - 'D3_PDFDOCUMENTS_ORDERNR' => 'Order no.', + 'D3_PDFDOCUMENTS_ORDERNR' => 'Order No.', 'D3_PDFDOCUMENTS_ORDER_FROM_AT' => 'Your order from %1$s at "%2$s"', 'D3_PDFDOCUMENTS_AMOUNT' => 'Amount', @@ -45,7 +47,7 @@ $aLang = array( 'D3_PDFDOCUMENTS_UNITPRICE' => 'Unit Price', 'D3_PDFDOCUMENTS_TOTALPRICE' => 'Total', - 'D3_PDFDOCUMENTS_ARTNR' => 'Item no.', + 'D3_PDFDOCUMENTS_ARTNR' => 'Item No.', 'D3_PDFDOCUMENTS_SUMBRUTTO' => 'Total products (incl. tax)', 'D3_PDFDOCUMENTS_DISCOUNT' => 'Discount', @@ -57,10 +59,10 @@ $aLang = array( 'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD' => 'Your chosen payment method', 'D3_PDFDOCUMENTS_RECEIVED_PAYMENT' => 'We have received the invoice amount with thanks.', - 'D3_PDFDOCUMENTS_MANAGINGDIRECTOR' => 'managing director', - 'D3_PDFDOCUMENTS_COURT' => 'local court', + 'D3_PDFDOCUMENTS_MANAGINGDIRECTOR' => 'Managing director', + 'D3_PDFDOCUMENTS_COURT' => 'Local court', 'D3_PDFDOCUMENTS_HRBNR' => 'HRB', 'D3_PDFDOCUMENTS_USTID' => 'VAT ID', - 'D3_PDFDOCUMENTS_BANK_BANKCODE' => 'BIC/SWIFT-Code', + 'D3_PDFDOCUMENTS_BANK_BANKCODE' => 'BIC/SWIFT Code', ); diff --git a/Application/views/tpl/documents/deliverynote/inc/informations.tpl b/Application/views/tpl/documents/deliverynote/inc/informations.tpl index b27d738..2ce19fb 100644 --- a/Application/views/tpl/documents/deliverynote/inc/informations.tpl +++ b/Application/views/tpl/documents/deliverynote/inc/informations.tpl @@ -3,7 +3,7 @@ [{block name="pdfDocumentInformations"}]
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] - [{oxmultilang ident="D3_PDFDOCUMENTS_DATE"}] [{$smarty.now|date_format:$dateFormat}] + [{oxmultilang ident="D3_PDFDOCUMENTS_DATE" suffix="COLON"}] [{$smarty.now|date_format:$dateFormat}]
[{/block}] diff --git a/Application/views/tpl/documents/deliverynote/inc/salutation.tpl b/Application/views/tpl/documents/deliverynote/inc/salutation.tpl index e9692d9..3a81ac1 100644 --- a/Application/views/tpl/documents/deliverynote/inc/salutation.tpl +++ b/Application/views/tpl/documents/deliverynote/inc/salutation.tpl @@ -1,7 +1,7 @@ [{block name="salutation"}]
[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR"}] [{$order->getFieldData('oxordernr')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}] diff --git a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl index 74c1b65..09eaf89 100644 --- a/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl +++ b/Application/views/tpl/documents/inc/elements/articlecostssummary.tpl @@ -1,28 +1,28 @@
- [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
[{if $order->getFormattedDiscount() != 0}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
[{/if}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
[{foreach from=$productVats key=VatKey item=oVat}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey}] + [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
[{/foreach}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey}] + [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
diff --git a/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl index cacea05..0677c89 100644 --- a/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl +++ b/Application/views/tpl/documents/inc/elements/deliveryaddress.tpl @@ -2,7 +2,7 @@ [{if $order->getFieldData('oxdelstreet')}]
- [{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYADDRESS" suffix="COLON"}]
[{if $order->getFieldData('oxdelcompany')}]
[{$order->getFieldData('oxdelcompany')}]
diff --git a/Application/views/tpl/documents/inc/elements/informations.tpl b/Application/views/tpl/documents/inc/elements/informations.tpl index c873a9d..761ae50 100644 --- a/Application/views/tpl/documents/inc/elements/informations.tpl +++ b/Application/views/tpl/documents/inc/elements/informations.tpl @@ -5,13 +5,13 @@ [{oxmultilang ident="D3_PDFDOCUMENTS_GET_IN_CONTACT"}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_TELEFON"}] [{$shop->getFieldData('oxtelefon')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_TELEFON" suffix="COLON"}] [{$shop->getFieldData('oxtelefon')}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_FAX"}] [{$shop->getFieldData('oxtelefax')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_FAX" suffix="COLON"}] [{$shop->getFieldData('oxtelefax')}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_EMAIL"}] [{$shop->getFieldData('oxinfoemail')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_EMAIL" suffix="COLON"}] [{$shop->getFieldData('oxinfoemail')}]
[{/block}]
@@ -25,10 +25,10 @@ [{$shop->getFieldData('oxbankname')}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR"}] [{$shop->getFieldData('oxibannumber')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR" suffix="COLON"}] [{$shop->getFieldData('oxibannumber')}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER"}] [{$shop->getFieldData('oxbiccode')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER" suffix="COLON"}] [{$shop->getFieldData('oxbiccode')}]
[{/block}] diff --git a/Application/views/tpl/documents/inc/page/footer.tpl b/Application/views/tpl/documents/inc/page/footer.tpl index 8c4b88f..c4f12b5 100644 --- a/Application/views/tpl/documents/inc/page/footer.tpl +++ b/Application/views/tpl/documents/inc/page/footer.tpl @@ -17,18 +17,18 @@ [{/block}] [{block name="pdfFooterCenter"}] -
[{oxmultilang ident="D3_PDFDOCUMENTS_MANAGINGDIRECTOR"}] [{$shop->getFieldData('oxfname')}] [{$shop->getFieldData('oxlname')}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_COURT"}] [{$shop->getFieldData('oxcourt')}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_HRBNR"}] [{$shop->getFieldData('oxhrbnr')}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_USTID"}] [{$shop->getFieldData('oxvatnumber')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_MANAGINGDIRECTOR" suffix="COLON"}] [{$shop->getFieldData('oxfname')}] [{$shop->getFieldData('oxlname')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_COURT" suffix="COLON"}] [{$shop->getFieldData('oxcourt')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_HRBNR" suffix="COLON"}] [{$shop->getFieldData('oxhrbnr')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_USTID" suffix="COLON"}] [{$shop->getFieldData('oxvatnumber')}]
[{/block}] [{block name="pdfFooterRight"}]
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]
[{$shop->getFieldData('oxbankname')}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR"}] [{$shop->getFieldData('oxibannumber')}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE"}] [{$shop->getFieldData('oxbiccode')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR" suffix="COLON"}] [{$shop->getFieldData('oxibannumber')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE" suffix="COLON"}] [{$shop->getFieldData('oxbiccode')}]
[{/block}] diff --git a/Application/views/tpl/documents/invoice/inc/conclusion.tpl b/Application/views/tpl/documents/invoice/inc/conclusion.tpl index e950980..f12fb4d 100644 --- a/Application/views/tpl/documents/invoice/inc/conclusion.tpl +++ b/Application/views/tpl/documents/invoice/inc/conclusion.tpl @@ -3,7 +3,7 @@ [{block name="conclusion_paymethod"}] - [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD"}] + [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}] [{$payment->getFieldData('oxdesc')}] diff --git a/Application/views/tpl/documents/invoice/inc/informations.tpl b/Application/views/tpl/documents/invoice/inc/informations.tpl index fcd9f43..7d89865 100644 --- a/Application/views/tpl/documents/invoice/inc/informations.tpl +++ b/Application/views/tpl/documents/invoice/inc/informations.tpl @@ -2,17 +2,17 @@
[{block name="pdfDocumentInformations"}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_ORDERBILLNR"}] [{$order->getFieldData('oxbillnr')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_ORDERBILLNR" suffix="COLON"}] [{$order->getFieldData('oxbillnr')}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_CUSTOMERNR" suffix="COLON"}] [{$user->getFieldData('oxcustnr')}]
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] - [{oxmultilang ident="D3_PDFDOCUMENTS_DATE"}] [{$order->getFieldData('oxbilldate')|date_format:$dateFormat}] + [{oxmultilang ident="D3_PDFDOCUMENTS_DATE" suffix="COLON"}] [{$order->getFieldData('oxbilldate')|date_format:$dateFormat}]
- [{oxmultilang ident="D3_PDFDOCUMENTS_USTIDNR"}] [{$shop->getFieldData('oxvatnumber')}] + [{oxmultilang ident="D3_PDFDOCUMENTS_USTIDNR" suffix="COLON"}] [{$shop->getFieldData('oxvatnumber')}]
[{/block}]
diff --git a/Application/views/tpl/documents/invoice/inc/salutation.tpl b/Application/views/tpl/documents/invoice/inc/salutation.tpl index 58e53e8..1bf0ce2 100644 --- a/Application/views/tpl/documents/invoice/inc/salutation.tpl +++ b/Application/views/tpl/documents/invoice/inc/salutation.tpl @@ -1,7 +1,7 @@ [{block name="salutation"}]
[{oxmultilang ident="D3_PDFDOCUMENTS_INVOICE"}]
-
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR"}] [{$order->getFieldData('oxordernr')}]
+
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]