From 812824100c45aff3391e2d801b26040a0e517b76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 8 Dec 2020 13:10:27 +0100 Subject: [PATCH 1/2] wrap getting file into try-catch --- app/Http/Controllers/InvoiceController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 8ee5573f0d2d..891054af3033 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -843,8 +843,12 @@ class InvoiceController extends BaseController { $file_path = $invoice->service()->getInvoiceDeliveryNote($invoice, $invoice->invitations->first()->contact); - $file = base_path("storage/app/public/{$file_path}"); + try { + $file = base_path("public/storage/{$file_path}"); - return response()->download($file, basename($file)); + return response()->download($file, basename($file)); + } catch(\Exception $e) { + return response(['message' => 'Oops, something went wrong. Make sure you have symlink to storage/ in public/ directory.'], 500); + } } } From bdedec19db6b737990c176ef7e9489c93782335c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 8 Dec 2020 13:19:38 +0100 Subject: [PATCH 2/2] remove balance due & total from delivery note pdf --- app/Services/PdfMaker/Design.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Services/PdfMaker/Design.php b/app/Services/PdfMaker/Design.php index f4897c8aa9a7..3c5115facb17 100644 --- a/app/Services/PdfMaker/Design.php +++ b/app/Services/PdfMaker/Design.php @@ -192,6 +192,13 @@ class Design extends BaseDesign $elements = []; + // We don't want to show account balance or invoice total on PDF.. or any amount with currency. + if ($this->type == 'delivery_note') { + $variables = array_filter($variables, function ($m) { + return !in_array($m, ['$invoice.balance_due', '$invoice.total']); + }); + } + foreach ($variables as $variable) { $_variable = explode('.', $variable)[1]; $_customs = ['custom1', 'custom2', 'custom3', 'custom4'];