Merge pull request #17989 from grokability/fixes-tcpdf-png-handling

Fixed #17940 - pngs not showing in acceptance PDFs

Author: snipe

app/Http/Controllers/Account/AcceptanceController.php

@@ -77,7 +77,6 @@ public function store(Request $request, $id) : RedirectResponse
         $acceptance = CheckoutAcceptance::find($id);
         $assigned_user = User::find($acceptance->assigned_to_id);
         $settings = Setting::getSettings();
-        $path_logo = '';
         $sig_filename='';
 
 
@@ -138,6 +137,13 @@ public function store(Request $request, $id) : RedirectResponse
         }
 
 
+        // Convert PDF logo to base64 for TCPDF
+        // This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable
+        $encoded_logo = null;
+        if ($settings->acceptance_pdf_logo) {
+            $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . $settings->acceptance_pdf_logo));
+        }
+
         // Get the data array ready for the notifications and PDF generation
         $data = [
             'item_tag' => $item->asset_tag,
@@ -153,8 +159,8 @@ public function store(Request $request, $id) : RedirectResponse
             'assigned_to' => $assigned_user->display_name,
             'site_name' => $settings->site_name,
             'company_name' => $item->company?->name?? $settings->site_name,
-            'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
-            'logo' => ($settings->acceptance_pdf_logo) ? public_path() . '/uploads/' . $settings->acceptance_pdf_logo : null,
+            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
+            'logo' => ($encoded_logo) ?? null,
             'date_settings' => $settings->date_display_format,
             'admin' => auth()->user()->present()?->fullName,
             'qty' => $acceptance->qty ?? 1,

app/Models/CheckoutAcceptance.php

@@ -184,7 +184,7 @@ public function generateAcceptancePdf($data, $pdf_filename) {
 
         $pdf->AddPage();
         if ($data['logo'] != null) {
-            $pdf->writeHTML('<img src="'.$data['logo'].'">', true, 0, true, 0, '');
+            $pdf->writeHTML('<img src="@'.$data['logo'].'">', true, 0, true, 0, '');
         } else {
             $pdf->writeHTML('<h3>'.$data['site_name'].'</h3><br /><br />', true, 0, true, 0, 'C');
         }
@@ -230,7 +230,7 @@ public function generateAcceptancePdf($data, $pdf_filename) {
         $pdf->Ln();
 
         if ($data['signature'] != null) {
-            $pdf->writeHTML('<img src="'.$data['signature'].'">', true, 0, true, 0, '');
+            $pdf->writeHTML('<img src="@'.$data['signature'].'">', true, 0, true, 0, '');
             $pdf->writeHTML('<hr>', true, 0, true, 0, '');
             $pdf->writeHTML(e($data['assigned_to']), true, 0, true, 0, 'C');
             $pdf->Ln();