D3Public/pdfdokumente
8
0
Fork 0
Code Pull Requests Releases Activity

add auto colon suffix

Browse Source
This commit is contained in:
Daniel Seifert 2020-06-30 22:21:27 +02:00
parent 9c12c8688b
commit b4b9a52757
11 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/translations/de/pdfdocuments_lang.php
View File

@ -35,6 +35,8 @@ $aLang = array(
'D3_PDFDOCUMENTS_DATE_FORMAT' => '%d.%m.%Y', 'D3_PDFDOCUMENTS_DATE_FORMAT' => '%d.%m.%Y',
'D3_PDFDOCUMENTS_USTIDNR' => 'Ust.-ID-Nr.', 'D3_PDFDOCUMENTS_USTIDNR' => 'Ust.-ID-Nr.',
'D3_PDFDOCUMENTS_DELIVERYADDRESS' => 'Lieferadresse',
'D3_PDFDOCUMENTS_INVOICE' => 'Rechnung', 'D3_PDFDOCUMENTS_INVOICE' => 'Rechnung',
'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Lieferschein', 'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Lieferschein',
'D3_PDFDOCUMENTS_ORDERNR' => 'Bestellnr.', 'D3_PDFDOCUMENTS_ORDERNR' => 'Bestellnr.',

22
Application/translations/en/pdfdocuments_lang.php
View File

@ -22,21 +22,23 @@ $aLang = array(
'D3_PDFDOCUMENTS_GET_IN_CONTACT' => 'You can contact us as follows', 'D3_PDFDOCUMENTS_GET_IN_CONTACT' => 'You can contact us as follows',
'D3_PDFDOCUMENTS_TELEFON' => 'Telephone', 'D3_PDFDOCUMENTS_TELEFON' => 'Telephone',
'D3_PDFDOCUMENTS_FAX' => 'Fax', '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_ACCOUNTNR' => 'IBAN',
'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER' => 'BIC', 'D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER' => 'BIC',
'D3_PDFDOCUMENTS_ORDERBILLNR' => 'Invoice no.', 'D3_PDFDOCUMENTS_ORDERBILLNR' => 'Invoice No.',
'D3_PDFDOCUMENTS_CUSTOMERNR' => 'Customer no.', 'D3_PDFDOCUMENTS_CUSTOMERNR' => 'Customer No.',
'D3_PDFDOCUMENTS_DATE' => 'Date', 'D3_PDFDOCUMENTS_DATE' => 'Date',
'D3_PDFDOCUMENTS_DATE_FORMAT' => '%Y-%m-%d', '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_INVOICE' => 'Invoice',
'D3_PDFDOCUMENTS_DELIVERYNOTE' => 'Deliverynote', '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_ORDER_FROM_AT' => 'Your order from %1$s at "%2$s"',
'D3_PDFDOCUMENTS_AMOUNT' => 'Amount', 'D3_PDFDOCUMENTS_AMOUNT' => 'Amount',
@ -45,7 +47,7 @@ $aLang = array(
'D3_PDFDOCUMENTS_UNITPRICE' => 'Unit Price', 'D3_PDFDOCUMENTS_UNITPRICE' => 'Unit Price',
'D3_PDFDOCUMENTS_TOTALPRICE' => 'Total', 'D3_PDFDOCUMENTS_TOTALPRICE' => 'Total',
'D3_PDFDOCUMENTS_ARTNR' => 'Item no.', 'D3_PDFDOCUMENTS_ARTNR' => 'Item No.',
'D3_PDFDOCUMENTS_SUMBRUTTO' => 'Total products (incl. tax)', 'D3_PDFDOCUMENTS_SUMBRUTTO' => 'Total products (incl. tax)',
'D3_PDFDOCUMENTS_DISCOUNT' => 'Discount', 'D3_PDFDOCUMENTS_DISCOUNT' => 'Discount',
@ -57,10 +59,10 @@ $aLang = array(
'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD' => 'Your chosen payment method', 'D3_PDFDOCUMENTS_USED_PAYMENTMETHOD' => 'Your chosen payment method',
'D3_PDFDOCUMENTS_RECEIVED_PAYMENT' => 'We have received the invoice amount with thanks.', 'D3_PDFDOCUMENTS_RECEIVED_PAYMENT' => 'We have received the invoice amount with thanks.',
'D3_PDFDOCUMENTS_MANAGINGDIRECTOR' => 'managing director', 'D3_PDFDOCUMENTS_MANAGINGDIRECTOR' => 'Managing director',
'D3_PDFDOCUMENTS_COURT' => 'local court', 'D3_PDFDOCUMENTS_COURT' => 'Local court',
'D3_PDFDOCUMENTS_HRBNR' => 'HRB', 'D3_PDFDOCUMENTS_HRBNR' => 'HRB',
'D3_PDFDOCUMENTS_USTID' => 'VAT ID', 'D3_PDFDOCUMENTS_USTID' => 'VAT ID',
'D3_PDFDOCUMENTS_BANK_BANKCODE' => 'BIC/SWIFT-Code', 'D3_PDFDOCUMENTS_BANK_BANKCODE' => 'BIC/SWIFT Code',
); );

2
Application/views/tpl/documents/deliverynote/inc/informations.tpl
View File

@ -3,7 +3,7 @@
[{block name="pdfDocumentInformations"}] [{block name="pdfDocumentInformations"}]
<div> <div>
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] [{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}]
</div> </div>
[{/block}] [{/block}]
</div> </div>

2
Application/views/tpl/documents/deliverynote/inc/salutation.tpl
View File

@ -1,7 +1,7 @@
[{block name="salutation"}] [{block name="salutation"}]
<div class="salutation"> <div class="salutation">
<div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]</div> <div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYNOTE"}]</div>
<div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR"}] [{$order->getFieldData('oxordernr')}]</div> <div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]</div>
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
[{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}] [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]

14
Application/views/tpl/documents/inc/elements/articlecostssummary.tpl
View File

@ -1,28 +1,28 @@
<td class="description"> <td class="description">
<div class="sumbrutto"> <div class="sumbrutto">
[{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO"}] [{oxmultilang ident="D3_PDFDOCUMENTS_SUMBRUTTO" suffix="COLON"}]
</div> </div>
[{if $order->getFormattedDiscount() != 0}] [{if $order->getFormattedDiscount() != 0}]
<div class="discount"> <div class="discount">
[{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT"}] [{oxmultilang ident="D3_PDFDOCUMENTS_DISCOUNT" suffix="COLON"}]
</div> </div>
[{/if}] [{/if}]
<div class="sumnetto"> <div class="sumnetto">
[{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO"}] [{oxmultilang ident="D3_PDFDOCUMENTS_SUMNETTO" suffix="COLON"}]
</div> </div>
[{foreach from=$productVats key=VatKey item=oVat}] [{foreach from=$productVats key=VatKey item=oVat}]
<div class="producttax"> <div class="producttax">
[{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey}] [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
</div> </div>
[{/foreach}] [{/foreach}]
<div class="delivery"> <div class="delivery">
[{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY"}] [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERY" suffix="COLON"}]
</div> </div>
<div class="deliverytax"> <div class="deliverytax">
[{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey}] [{oxmultilang ident="D3_PDFDOCUMENTS_TAX" args=$VatKey suffix="COLON"}]
</div> </div>
<div class="totalsum"> <div class="totalsum">
[{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT"}] [{oxmultilang ident="D3_PDFDOCUMENTS_TOTALSUMBRUT" suffix="COLON"}]
</div> </div>
</td> </td>
<td class="values"> <td class="values">

2
Application/views/tpl/documents/inc/elements/deliveryaddress.tpl
View File

@ -2,7 +2,7 @@
[{if $order->getFieldData('oxdelstreet')}] [{if $order->getFieldData('oxdelstreet')}]
<div class="deliveryaddress"> <div class="deliveryaddress">
<div class="headline"> <div class="headline">
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_DELIVERYADDRESS"}] [{oxmultilang ident="D3_PDFDOCUMENTS_DELIVERYADDRESS" suffix="COLON"}]
</div> </div>
[{if $order->getFieldData('oxdelcompany')}] [{if $order->getFieldData('oxdelcompany')}]
<div class="company">[{$order->getFieldData('oxdelcompany')}]</div> <div class="company">[{$order->getFieldData('oxdelcompany')}]</div>

10
Application/views/tpl/documents/inc/elements/informations.tpl
View File

@ -5,13 +5,13 @@
[{oxmultilang ident="D3_PDFDOCUMENTS_GET_IN_CONTACT"}] [{oxmultilang ident="D3_PDFDOCUMENTS_GET_IN_CONTACT"}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_TELEFON"}] [{$shop->getFieldData('oxtelefon')}] [{oxmultilang ident="D3_PDFDOCUMENTS_TELEFON" suffix="COLON"}] [{$shop->getFieldData('oxtelefon')}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_FAX"}] [{$shop->getFieldData('oxtelefax')}] [{oxmultilang ident="D3_PDFDOCUMENTS_FAX" suffix="COLON"}] [{$shop->getFieldData('oxtelefax')}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_EMAIL"}] [{$shop->getFieldData('oxinfoemail')}] [{oxmultilang ident="D3_PDFDOCUMENTS_EMAIL" suffix="COLON"}] [{$shop->getFieldData('oxinfoemail')}]
</div> </div>
[{/block}] [{/block}]
</div> </div>
@ -25,10 +25,10 @@
[{$shop->getFieldData('oxbankname')}] [{$shop->getFieldData('oxbankname')}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR"}] [{$shop->getFieldData('oxibannumber')}] [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR" suffix="COLON"}] [{$shop->getFieldData('oxibannumber')}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER"}] [{$shop->getFieldData('oxbiccode')}] [{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE_HEADER" suffix="COLON"}] [{$shop->getFieldData('oxbiccode')}]
</div> </div>
[{/block}] [{/block}]
</div> </div>

12
Application/views/tpl/documents/inc/page/footer.tpl
View File

@ -17,18 +17,18 @@
[{/block}] [{/block}]
[{block name="pdfFooterCenter"}] [{block name="pdfFooterCenter"}]
<td class="footerCenter"> <td class="footerCenter">
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_MANAGINGDIRECTOR"}] [{$shop->getFieldData('oxfname')}] [{$shop->getFieldData('oxlname')}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_MANAGINGDIRECTOR" suffix="COLON"}] [{$shop->getFieldData('oxfname')}] [{$shop->getFieldData('oxlname')}]</div>
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_COURT"}] [{$shop->getFieldData('oxcourt')}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_COURT" suffix="COLON"}] [{$shop->getFieldData('oxcourt')}]</div>
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_HRBNR"}] [{$shop->getFieldData('oxhrbnr')}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_HRBNR" suffix="COLON"}] [{$shop->getFieldData('oxhrbnr')}]</div>
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_USTID"}] [{$shop->getFieldData('oxvatnumber')}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_USTID" suffix="COLON"}] [{$shop->getFieldData('oxvatnumber')}]</div>
</td> </td>
[{/block}] [{/block}]
[{block name="pdfFooterRight"}] [{block name="pdfFooterRight"}]
<td class="footerRight"> <td class="footerRight">
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNT"}]</div>
<div>[{$shop->getFieldData('oxbankname')}]</div> <div>[{$shop->getFieldData('oxbankname')}]</div>
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR"}] [{$shop->getFieldData('oxibannumber')}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_ACCOUNTNR" suffix="COLON"}] [{$shop->getFieldData('oxibannumber')}]</div>
<div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE"}] [{$shop->getFieldData('oxbiccode')}]</div> <div>[{oxmultilang ident="D3_PDFDOCUMENTS_BANK_BANKCODE" suffix="COLON"}] [{$shop->getFieldData('oxbiccode')}]</div>
</td> </td>
[{/block}] [{/block}]
</tr> </tr>

2
Application/views/tpl/documents/invoice/inc/conclusion.tpl
View File

@ -3,7 +3,7 @@
[{block name="conclusion_paymethod"}] [{block name="conclusion_paymethod"}]
<tr> <tr>
<td> <td>
[{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD"}] [{oxmultilang ident="D3_PDFDOCUMENTS_USED_PAYMENTMETHOD" suffix="COLON"}]
[{$payment->getFieldData('oxdesc')}] [{$payment->getFieldData('oxdesc')}]
</td> </td>
</tr> </tr>

8
Application/views/tpl/documents/invoice/inc/informations.tpl
View File

@ -2,17 +2,17 @@
<div class="documentinformations"> <div class="documentinformations">
[{block name="pdfDocumentInformations"}] [{block name="pdfDocumentInformations"}]
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERBILLNR"}] [{$order->getFieldData('oxbillnr')}] [{oxmultilang ident="D3_PDFDOCUMENTS_ORDERBILLNR" suffix="COLON"}] [{$order->getFieldData('oxbillnr')}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_CUSTOMERNR"}] [{$user->getFieldData('oxcustnr')}] [{oxmultilang ident="D3_PDFDOCUMENTS_CUSTOMERNR" suffix="COLON"}] [{$user->getFieldData('oxcustnr')}]
</div> </div>
<div> <div>
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] [{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}]
</div> </div>
<div> <div>
[{oxmultilang ident="D3_PDFDOCUMENTS_USTIDNR"}] [{$shop->getFieldData('oxvatnumber')}] [{oxmultilang ident="D3_PDFDOCUMENTS_USTIDNR" suffix="COLON"}] [{$shop->getFieldData('oxvatnumber')}]
</div> </div>
[{/block}] [{/block}]
</div> </div>

2
Application/views/tpl/documents/invoice/inc/salutation.tpl
View File

@ -1,7 +1,7 @@
[{block name="salutation"}] [{block name="salutation"}]
<div class="salutation"> <div class="salutation">
<div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_INVOICE"}]</div> <div class="documenttype">[{oxmultilang ident="D3_PDFDOCUMENTS_INVOICE"}]</div>
<div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR"}] [{$order->getFieldData('oxordernr')}]</div> <div class="documentnumber">[{oxmultilang ident="D3_PDFDOCUMENTS_ORDERNR" suffix="COLON"}] [{$order->getFieldData('oxordernr')}]</div>
[{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}] [{assign var="dateFormat" value='D3_PDFDOCUMENTS_DATE_FORMAT'|oxmultilangassign}]
[{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}] [{assign var="sArgs" value=$order->getFieldData('oxorderdate')|date_format:$dateFormat|cat:"//"|cat:$shop->getFieldData('oxname')}]