From 5ff67da36768d84207a6b6fe5e57309a259e61d4 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Sat, 22 Mar 2025 17:31:37 +0100
Subject: [PATCH] RML Invoice Layout Tweaks

---
 Layout/default/PreorderBillingInvoice/PDF_FOOTER.html |  7 +++----
 Layout/default/PreorderBillingInvoice/PDF_HEADER.html | 11 +++++++++--
 .../PreorderBillingInvoice/PreorderBillingInvoice.php |  4 +++-
 lib/mvcfronk/mfWkhtmltopdf/mfWkhtmltopdf.php          |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html b/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html
index 0a984b7d6..309127f03 100644
--- a/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html
+++ b/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html
@@ -30,10 +30,9 @@
 
 <div style="margin-bottom: 16px;height: 1px"></div>
 <div style="color:grey;text-align: center;margin-bottom: 0">
-    <span>XINON GmbH | Fladnitz 150 | 8322 Studenzen</span><br>
-    <span>Tel.: +43 3115 40800 | E-Mail: office@xinon.at</span><br>
-    <span>UID: ATU68711968 | FN: 416556h | LG: Feldbach</span><br>
-    <span>IBAN: {{ bank_iban }} | BIC: {{ bank_bic }}</span><br>
+    <span>RML Infrastruktur GmbH | Wirtschaftspark A | 8940 Liezen</span><br>
+    <span>E-Mail: office@rmlinfrastruktur.at | IBAN: {{ bank_iban }}</span><br>
+    <span>UID: ATU77557626 | FN: 568443x | Gerichtsstand Liezen</span><br>
 </div>
 
 <div style="text-align: right">Seite <span class="page"></span> von <span class="topage"></span></div>
diff --git a/Layout/default/PreorderBillingInvoice/PDF_HEADER.html b/Layout/default/PreorderBillingInvoice/PDF_HEADER.html
index 9b0cf49d9..948914ec2 100644
--- a/Layout/default/PreorderBillingInvoice/PDF_HEADER.html
+++ b/Layout/default/PreorderBillingInvoice/PDF_HEADER.html
@@ -5,6 +5,9 @@
     <meta charset="utf-8" />
     <style>
         body {
+            position: absolute;
+            top: 360px;
+            width: 100%;
             border: 0;
             margin: 0;
             padding-top: 0;
@@ -34,10 +37,14 @@
 
         .invoice-details th {
             text-align: right;
+            padding-top: 0;
+            padding-bottom: 0;
         }
 
         .invoice-details td {
             text-align: left;
+            padding-top: 0;
+            padding-bottom: 0;
             padding-left: 4px;
         }
 
@@ -47,7 +54,7 @@
         }
 
         #topSpacer {
-         margin-bottom: 32px;
+            margin-bottom: 32px;
             height: 20px;
         }
 
@@ -57,7 +64,7 @@
 
 <div id="topSpacer"></div>
 
-<table style="width: 100%; margin-bottom: 36px;">
+<table style="width: 100%; margin-bottom: 64px;">
     <tr>
         <td style="padding-left: 30pt; width: 60%; font-size: 14px; padding-top: 52px;">
             <strong>RML Infrastruktur GmbH</strong><br />
diff --git a/application/PreorderBillingInvoice/PreorderBillingInvoice.php b/application/PreorderBillingInvoice/PreorderBillingInvoice.php
index 9556324da..bf796d924 100644
--- a/application/PreorderBillingInvoice/PreorderBillingInvoice.php
+++ b/application/PreorderBillingInvoice/PreorderBillingInvoice.php
@@ -75,13 +75,15 @@ class PreorderBillingInvoice extends mfBaseModel {
 
         // Replace placeholders in header
         $footerHtml = file_get_contents(BASEDIR . "/Layout/default/PreorderBillingInvoice/PDF_FOOTER.html");
+        $footerHtml = str_replace("{{ bank_iban }}", "AT85 1200 0100 3986 5885", $footerHtml);
+        $footerHtml = str_replace("{{ bank_bic }}", "", $footerHtml);
 
         $footerFile = BASEDIR . "/var/temp/preorderbillinginvoice_footer-" . date("U") . "-" . rand(1000, 9999) . ".html";
         file_put_contents($footerFile, $footerHtml);
 
 
         $pdf = new PdfForm("PreorderBillingInvoice/PDF_MAIN", $pdf_vars);
-        $wkhtmltopdfArgs = "--header-html $headerFile --footer-html $footerFile";
+        $wkhtmltopdfArgs = "--margin-top 10mm --header-spacing 96 --header-html '$headerFile' --footer-html '$footerFile'";
 
         $filename = $pdf->render($wkhtmltopdfArgs);
 
diff --git a/lib/mvcfronk/mfWkhtmltopdf/mfWkhtmltopdf.php b/lib/mvcfronk/mfWkhtmltopdf/mfWkhtmltopdf.php
index e79a07a7a..f1ab2b5bc 100755
--- a/lib/mvcfronk/mfWkhtmltopdf/mfWkhtmltopdf.php
+++ b/lib/mvcfronk/mfWkhtmltopdf/mfWkhtmltopdf.php
@@ -55,7 +55,7 @@ class mfWkhtmltopdf {
       $wkargs.=" $additionalArgs";
     }
     $cmd = "$wkbin $wkargs - $path/$filename";
-    
+    $this->log->debug(__METHOD__.": Command Line: $cmd");
     $html = $this->html;
     $pipe = popen($cmd,"w");