add final changes

Application/Model/Documents/invoicePdf.php

@@ -31,8 +31,7 @@ class invoicePdf extends pdfdocumentsOrder implements pdfdocumentsOrderinvoiceIn
      */
     public function getRequestId()
     {
-        // same like in OXID PDF module
+        return 'invoice';
-        return 'standart';
     }
 
     /**

Application/views/admin/de/pdfdocuments_lang.php

@@ -19,6 +19,7 @@ $aLang     = array(
     'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Grundeinstellungen',
     'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Entwicklermodus',
 
+    'D3_PDFDOCUMENTS'                                    => 'PDF-Dokumente',
     'D3_PDFDOCUMENTS_INVOICE'                            => 'Rechnung',
     'D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO'               => 'Rechnung ohne Logo',
     'D3_PDFDOCUMENTS_DELIVERYNOTE'                       => 'Lieferschein',

Application/views/admin/en/pdfdocuments_lang.php

@@ -19,6 +19,7 @@ $aLang     = array(
     'SHOP_MODULE_GROUP_d3PdfDocumentsmain'               => 'Basic settings',
     'SHOP_MODULE_d3PdfDocumentsbDev'                     => 'Developer mode',
 
+    'D3_PDFDOCUMENTS'                                    => 'PDF Documents',
     'D3_PDFDOCUMENTS_INVOICE'                            => 'Invoice',
     'D3_PDFDOCUMENTS_INVOICE_WITHOUT_LOGO'               => 'Invoice without logo',
     'D3_PDFDOCUMENTS_DELIVERYNOTE'                       => 'Deliverynote',

Application/views/tpl/admin/orderoverview_pdfform.tpl

@@ -1,43 +1,46 @@
 [{if $edit && $oView->d3CanExport()}]
     <br>
-    <form name="myedit2" id="myedit2" action="[{$oViewConf->getSelfLink()}]" method="post" target="expPDF">
+    <form name="d3CreatePdf" id="d3CreatePdf" action="[{$oViewConf->getSelfLink()}]" method="post" target="d3ExpPDF">
         [{$oViewConf->getHiddenSid()}]
         <input type="hidden" name="cl" value="order_overview">
         <input type="hidden" name="fnc" value="d3CreatePDF">
         <input type="hidden" name="oxid" value="[{$oxid}]">
-        <table style="border-spacing: 0;border-collapse: collapse;padding: 5px;border : 1px #A9A9A9 solid; width:220px">
+        <fieldset style="padding: 5px">
-            <tr>
+            <legend>[{oxmultilang ident="D3_PDFDOCUMENTS"}]</legend>
-                <td rowspan="3">
+            <table style="width: 100%">
-                    <img src="[{$oViewConf->getImageUrl()}]/pdf_icon.gif" style="width: 41px; height: 38px; border: none;" alt="" hspace="0" vspace="0" align="absmiddle">
+                <tr>
-                </td>
+                    <td rowspan="3">
-                <td style="vertical-align: top; text-align: right" class="edittext">
+                        <img src="[{$oViewConf->getImageUrl()}]/pdf_icon.gif" alt="[{oxmultilang ident="D3_PDFDOCUMENTS"}]">
-                    <label for="pdftype">[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_TYPE"}]</label>:&nbsp;
+                    </td>
-                    <select id="pdftype" name="pdftype" class="editinput" style="width:80px;">
+                    <td style="vertical-align: top; text-align: right" class="edittext">
-                        [{block name="d3_pdfdocuments_order_overview_pdfTypeOptions"}]
+                        <label for="pdftype">[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_TYPE"}]</label>:&nbsp;
-                            [{assign var="generatorList" value=$oView->d3getGeneratorList()}]
+                        <select id="pdftype" name="pdftype" class="editinput" style="width:80px;">
-                            [{foreach from=$generatorList->getList() item="generator"}]
+                            [{block name="d3_pdfdocuments_order_overview_pdfTypeOptions"}]
-                                <option value="[{$generator->getRequestId()}]">[{oxmultilang ident=$generator->getTitleIdent()}]</option>
+                                [{assign var="generatorList" value=$oView->d3getGeneratorList()}]
+                                [{foreach from=$generatorList->getList() item="generator"}]
+                                    <option value="[{$generator->getRequestId()}]">[{oxmultilang ident=$generator->getTitleIdent()}]</option>
+                                [{/foreach}]
+                            [{/block}]
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td style="text-align: right" class="edittext">
+                        <label for="pdflanguage">[{oxmultilang ident="GENERAL_LANGUAGE"}]</label>
+                        <select id="pdflanguage" name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
+                            [{foreach from=$alangs key=lang item=slang}]
+                                <option value="[{$lang}]" [{if $lang == "0"}]SELECTED[{/if}]>[{$slang}]</option>
                             [{/foreach}]
-                        [{/block}]
+                        </select>
-                    </select>
+                    </td>
-                </td>
+                </tr>
-            </tr>
+                <tr>
-            <tr>
+                    <td style="text-align: right" class="edittext"><br/>
-                <td style="text-align: right" class="edittext">
+                        <input type="submit" class="edittext" name="save" value="[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_GENERATE"}]">
-                    <label for="pdflanguage">[{oxmultilang ident="GENERAL_LANGUAGE"}]</label>
+                        <iframe name="d3ExpPDF" style="width: 0; height: 0; border: none; display:none;"></iframe>
-                    <select id="pdflanguage" name="pdflanguage" class="saveinnewlanginput" style="width:80px;">
+                    </td>
-                        [{foreach from=$alangs key=lang item=slang}]
+                </tr>
-                            <option value="[{$lang}]" [{if $lang == "0"}]SELECTED[{/if}]>[{$slang}]</option>
+            </table>
-                        [{/foreach}]
+        </fieldset>
-                    </select>
-                </td>
-            </tr>
-            <tr>
-                <td style="text-align: right" class="edittext"><br/>
-                    <input type="submit" class="edittext" name="save" value="[{oxmultilang ident="D3_PDFDOCUMENTS_PDF_GENERATE"}]">
-                    <iframe name="expPDF" style="width: 0; height: 0; border: none; display:none;"></iframe>
-                </td>
-            </tr>
-        </table>
     </form>
 [{/if}]

out/src/css/pdfStyling.css

@@ -98,7 +98,7 @@ table{
 }
 .article_table th,
 .article_table_prices th {
-  border-bottom: solid 0.15mm #000;
+  border-bottom: solid 0.75pt #000;
   font-weight: normal;
   font-size: 11px;
 }
@@ -174,11 +174,11 @@ table{
   text-align: right;
 }
 .article_costs_table .sumnetto td {
-  border-top: solid 0.15mm #000;
+  border-top: 0.75pt solid #000;
 }
 .article_costs_table .voucherdiscount td,
 .article_costs_table .sumbrutto td {
-  border-bottom: solid 0.15mm #000;
+  border-bottom: solid 0.75pt #000;
 }
 .article_costs_table .totalseparator td {
   height: 0;
@@ -186,9 +186,12 @@ table{
 }
 .article_costs_table .totalseparator td,
 .article_costs_table .totalsum td {
-  border-bottom: solid 0.3mm #000;
+  border-bottom: solid 0.75pt #000;
   font-weight: bold;
 }
+.article_costs_table .totalsum td {
+  border-bottom: double 2pt #000;
+}
 
 .conclusion_payment,
 .conclusion_thankyou {
@@ -204,7 +207,7 @@ table{
   padding: 0;
 }
 .footer table {
-  border-top: solid 1px #000;
+  border-top: solid 0.75pt #000;
   width: 100%;
   position: relative;
 }