Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

Merge pull request #4442 from beganovich/v5-delivery-notes-updates

Browse Source 
(v5)  Remove balance due & total from delivery note PDFs
This commit is contained in:
Benjamin Beganović 2020-12-08 13:21:42 +01:00 committed by GitHub
commit b446024596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/InvoiceController.php
View File

@ -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);
}
}
}

7
app/Services/PdfMaker/Design.php
View File

@ -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'];