Preorder Billing Marketshare Price + RML layout tweaks

Layout/default/PreorderBillingInvoice/Index.php

@@ -46,7 +46,7 @@ $pagination_entity_name = "Rechnungen";
                                 </select>
                             </div>
                             <div class="col-1">
-                                <label class="form-label" for="filter_fibu_account_number">Fibu Kontonummer</label>
+                                <label class="form-label" for="filter_fibu_account_number">Kundennummer</label>
                                 <input type="text" class="form-control" name="filter[fibu_account_number]" id="filter_fibu_account_number" value="<?=(array_key_exists("fibu_account_number", $filter)) ? $filter['fibu_account_number'] : ""?>"/>
                             </div>
 
@@ -109,6 +109,7 @@ $pagination_entity_name = "Rechnungen";
                                     <th>Rechnungsdatum</th>
                                     <th>Kundennummer</th>
                                     <th>Rechnungsadresse</th>
+                                    <th>Text</th>
                                     <th>Netto</th>
                                     <th>Ust.</th>
                                     <th>Brutto</th>
@@ -136,6 +137,7 @@ $pagination_entity_name = "Rechnungen";
                                             <?=$invoice->zip?> <?=$invoice->city?>
                                             <?=($invoice->country != "Österreich") ? "<br >".$invoice->country : ""?>
                                         </td>
+                                        <td><?=$invoice->head_text?></td>
                                         <td>€ <?=number_format($invoice->total, 2, ",", ".")?></td>
                                         <td>€ <?=number_format($invoice->total_gross - $invoice->total, 2, ",", ".")?></td>
                                         <td>€ <?=number_format($invoice->total_gross, 2, ",", ".")?></td>

Layout/default/PreorderBillingInvoice/PDF_HEADER.html

@@ -6,7 +6,7 @@
     <style>
         body {
             position: absolute;
-            top: 360px;
+            top: 290px;
             width: 100%;
             border: 0;
             margin: 0;
@@ -102,22 +102,6 @@
                                 <td>{{ customerNumber }}</td>
                             </tr>
                             {{ vatHtml }}
-                            <tr>
-                                <th style="padding-top: 8px;">Sachbearbeiter:</th>
-                                <td style="padding-top: 8px;">{{ caseWorker }}</td>
-                            </tr>
-                            <tr>
-                                <th>Telefon:</th>
-                                <td>{{ caseWorkerPhone }}</td>
-                            </tr>
-                            <tr>
-                                <th>Email:</th>
-                                <td>{{ caseWorkerEmail }}</td>
-                            </tr>
-                            <tr>
-                                <th>Unsere Auftragsnummer:</th>
-                                <td>{{ orderNumber }}</td>
-                            </tr>
                         </table>
                     </td>
                 </tr>

Layout/default/PreorderBillingInvoice/PDF_MAIN.php

@@ -86,12 +86,15 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
 
     <h2><?=($is_credit) ? "Gutschrift" : "Rechnung"?> <?=$invoice->invoice_number?></h2>
 
+    <?php if($invoice->head_text):?>
+        <p><?=$invoice->head_text?></p>
+    <?php endif; ?>
+
     <table style="border-collapse: collapse; width: 100%;" id="invoiceTable">
         <tr style="font-weight: bold; border-bottom: 1px solid black;" class="uneven">
             <th style="text-align: left">Pos</th>
             <th style="text-align: left">Artikel</th>
             <th style="text-align: left">Leistung / Produkt</th>
-            <th style="text-align: right">Preis</th>
             <th style="text-align: right">Menge</th>
             <th style="text-align: left">Einheit</th>
             <th style="text-align: right">Preis €</th>
@@ -112,7 +115,6 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
             <td style="text-align: left"><?=$i+1?></td>
             <td style="text-align: left"><?=$p->article_number?></td>
             <td style="text-align: left"><?=$p->article_name?></td>
-            <td style="text-align: right"><?=$price?> €</td>
             <td style="text-align: right"><?=$amount?></td>
             <td style="text-align: left"><?=$p->unit?></td>
             <td style="text-align: right"><?=$price?> €</td>
@@ -146,13 +148,14 @@ $this->setReturnValue(['filename' => $invoice->invoice_number . ".pdf"]);
         </tr>
     </table>
 
-
     <div style="margin-top: 20pt;">
         <?php if($invoice->tax_text): ?>
             <p style="font-weight: bold;"><?=$invoice->tax_text?></p>
         <?php endif; ?>
-    </div>
 
+        Zahlungsziel 14 Tage.
+
+    </div>
 
 </body>
 </html>