diff --git a/Application/views/admin_smarty/de/pdfdocuments_lang.php b/Application/views/admin_smarty/de/pdfdocuments_lang.php index d77afd1..8556b65 100644 --- a/Application/views/admin_smarty/de/pdfdocuments_lang.php +++ b/Application/views/admin_smarty/de/pdfdocuments_lang.php @@ -8,16 +8,14 @@ * @link http://www.oxidmodule.com */ +use D3\PdfDocuments\Application\Model\Constants; + $sLangName = "Deutsch"; $aLang = array( 'charset' => 'utf-8', 'SHOP_MODULE_GROUP_d3PdfDocumentsmain' => 'Grundeinstellungen', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Entwicklermodus', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName' => 'Alternativer PDF-Logo Name

- Ohne Angabe ( leer ) wird automatisch folgender Datei-Name gewählt: pdf_logo.jpg
- Diese Datei muss sich im source/out/THEME/img/ Ordner befinden und muss aus technischen Gründen PNG/ JPG sein.

- Notfalls wird kein Bild eingefügt!', + 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Entwicklermodus', 'D3_PDFDOCUMENTS' => 'PDF-Dokumente', 'D3_PDFDOCUMENTS_INVOICE' => 'Rechnung', diff --git a/Application/views/admin_smarty/en/pdfdocuments_lang.php b/Application/views/admin_smarty/en/pdfdocuments_lang.php index 67947a8..bd868d4 100644 --- a/Application/views/admin_smarty/en/pdfdocuments_lang.php +++ b/Application/views/admin_smarty/en/pdfdocuments_lang.php @@ -8,16 +8,14 @@ * @link http://www.oxidmodule.com */ +use D3\PdfDocuments\Application\Model\Constants; + $sLangName = "English"; $aLang = array( 'charset' => 'utf-8', 'SHOP_MODULE_GROUP_d3PdfDocumentsmain' => 'Basic settings', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Developer mode', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName' => 'Alternative PDF Logo Name

- Without specification (empty) the following file name will be automatically selected: pdf_logo.jpg
- This file must be located in the source/out/THEME/img/ folder and must be PNG or JPG for technical reasons.

- If necessary, no image will be inserted!', + 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Developer mode', 'D3_PDFDOCUMENTS' => 'PDF Documents', 'D3_PDFDOCUMENTS_INVOICE' => 'Invoice', diff --git a/Application/views/admin_twig/de/pdfdocuments_lang.php b/Application/views/admin_twig/de/pdfdocuments_lang.php index 4849bc9..2ecffb8 100644 --- a/Application/views/admin_twig/de/pdfdocuments_lang.php +++ b/Application/views/admin_twig/de/pdfdocuments_lang.php @@ -15,11 +15,7 @@ $aLang = array( 'charset' => 'utf-8', 'SHOP_MODULE_GROUP_d3PdfDocumentsmain' => 'Grundeinstellungen', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Entwicklermodus', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName' => 'Alternativer PDF-Logo Name

- Ohne Angabe ( leer ) wird automatisch folgender Datei-Name gewählt: pdf_logo.jpg
- Diese Datei muss sich im source/out/THEME/img/ Ordner befinden und muss aus technischen Gründen PNG oder JPG sein.

- Notfalls wird kein Bild eingefügt!', + 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Entwicklermodus', 'D3_PDFDOCUMENTS' => 'PDF-Dokumente', 'D3_PDFDOCUMENTS_INVOICE' => 'Rechnung', diff --git a/Application/views/admin_twig/en/pdfdocuments_lang.php b/Application/views/admin_twig/en/pdfdocuments_lang.php index 5f5819c..bd868d4 100644 --- a/Application/views/admin_twig/en/pdfdocuments_lang.php +++ b/Application/views/admin_twig/en/pdfdocuments_lang.php @@ -8,16 +8,14 @@ * @link http://www.oxidmodule.com */ +use D3\PdfDocuments\Application\Model\Constants; + $sLangName = "English"; $aLang = array( 'charset' => 'utf-8', 'SHOP_MODULE_GROUP_d3PdfDocumentsmain' => 'Basic settings', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Developer mode', - 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'_sAlternativePdfLogoName' => 'Alternative PDF Logo Name

- Without specification (empty) the following file name will be automatically selected: pdf_logo.jpg
- This file must be located in the source/out/THEME/img/ folder and must be PNG/ JPG for technical reasons.

- If necessary, no image will be inserted!', + 'SHOP_MODULE_'. Constants::OXID_MODULE_ID.'bDev' => 'Developer mode', 'D3_PDFDOCUMENTS' => 'PDF Documents', 'D3_PDFDOCUMENTS_INVOICE' => 'Invoice', diff --git a/README.en.md b/README.en.md index b4a88ab..56b7fa7 100644 --- a/README.en.md +++ b/README.en.md @@ -38,7 +38,8 @@ Detailed installation instructions can be found [online](https://docs.oxidmodule ## Credits: -- PDF logo made by Dimitriy Morilubov from www.flaticon.com +- PDF logo made by Dimitriy Morilubov by www.flaticon.com +- example company logo by https://www.logologo.com/ ## License diff --git a/README.md b/README.md index 329093a..ccc9cfb 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Eine detaillierte Installationsanleitung finden Sie [online](https://docs.oxidmo ## Danksagung: - PDF-Logo erstellt von Dimitriy Morilubov von www.flaticon.com +- Beispielfirmenlogo von https://www.logologo.com/ ## Lizenz diff --git a/assets/out/img/clogo.jpg b/assets/out/img/clogo.jpg new file mode 100644 index 0000000..08e6f37 Binary files /dev/null and b/assets/out/img/clogo.jpg differ diff --git a/views/smarty/documents/inc/page/header.tpl b/views/smarty/documents/inc/page/header.tpl index 8e864ac..773ec53 100644 --- a/views/smarty/documents/inc/page/header.tpl +++ b/views/smarty/documents/inc/page/header.tpl @@ -3,11 +3,9 @@ [{block name="pdfHeader"}]
[{if $showLogo}] - [{* pdf logo is available only in non admin theme *}] - [{assign var="isAdmin" value=$viewConfig->isAdmin()}] - [{$viewConfig->setAdminMode(false)}] - - [{$viewConfig->setAdminMode($isAdmin)}] + [{block name="pdfHeaderLogo"}] + + [{/block}] [{/if}]
[{/block}] \ No newline at end of file diff --git a/views/twig/documents/inc/page/header.html.twig b/views/twig/documents/inc/page/header.html.twig index 04018bb..458c11d 100644 --- a/views/twig/documents/inc/page/header.html.twig +++ b/views/twig/documents/inc/page/header.html.twig @@ -1,16 +1,11 @@ {% set showLogo = showLogo|default(1) %} -{% set sPdfLogo = sAlternativePdfLogo %} {% block pdfHeader %}
{% if showLogo %} - {# pdf logo is available only in non admin theme #} - {% set isAdmin = oViewConf.isAdmin() %} - {{ oViewConf.setAdminMode(false) }} - {% if sPdfLogo %} - - {% endif %} - {{ oViewConf.setAdminMode(isAdmin) }} + {% block pdfHeaderLogo %} + + {% endblock %} {% endif %}
{% endblock %} \ No newline at end of file