A free open source IT asset/license management system
More small tweaks
snipe8ea339f0ef0f
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex 36904e6b20..735946c3f5 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -138,14 +138,6 @@ class AcceptanceController extends Controller}- // Check for the PDF logo path and use that, otherwise use the regular logo path- if (!is_null($settings->acceptance_pdf_logo)) {- $path_logo = public_path() . '/uploads/' . $settings->acceptance_pdf_logo;- } elseif (!is_null($settings->logo)) {- $path_logo = public_path() . '/uploads/' . $settings->logo;- }--// Get the data array ready for the notifications and PDF generation$data = ['item_tag' => $item->asset_tag,@@ -162,7 +154,7 @@ class AcceptanceController extends Controller'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' => $path_logo,+ 'logo' => ($settings->acceptance_pdf_logo) ? public_path() . '/uploads/' . $settings->acceptance_pdf_logo : null,'date_settings' => $settings->date_display_format,'admin' => auth()->user()->present()?->fullName,'qty' => $acceptance->qty ?? 1,diff --git a/app/Models/CheckoutAcceptance.php b/app/Models/CheckoutAcceptance.phpindex 4cfd79d092..85fa472ffe 100644--- a/app/Models/CheckoutAcceptance.php+++ b/app/Models/CheckoutAcceptance.php@@ -185,13 +185,12 @@ class CheckoutAcceptance extends Model$pdf->SetPrintFooter(false);$pdf->AddPage();- if ($data['logo']) {+ if ($data['logo'] != null) {$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');}- if ($data['site_name']) {- $pdf->writeHTML($data['site_name'], true, 0, true, 0, 'C');- }$pdf->Ln();$pdf->writeHTML(trans('general.date') . ': ' . Helper::getFormattedDateObject(now(), 'datetime', false), true, 0, true, 0, '');