From 44956ce6b83344433de07788155c95474c3cdf18 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 17 Aug 2023 09:06:30 +1000 Subject: [PATCH] merge downloads into single action for e invoices --- .../Controllers/ClientPortal/InvoiceController.php | 13 +++++++++++-- .../views/portal/ninja2020/invoices/index.blade.php | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index f67ae6042705..265cc5f8961e 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -252,11 +252,20 @@ class InvoiceController extends Controller // create new archive $zipFile = new \PhpZip\ZipFile(); try { + foreach ($invoices as $invoice) { - //add it to the zip - $zipFile->addFromString(basename($invoice->pdf_file_path()), file_get_contents($invoice->pdf_file_path(null, 'url', true))); + + if ($invoice->client->getSetting('enable_e_invoice')) { + $xml = $invoice->service()->getEInvoice(); + $zipFile->addFromString($invoice->getFileName("xml"), $xml); + } + + $file = $invoice->service()->getRawInvoicePdf(); + $zip_file_name = $invoice->getFileName(); + $zipFile->addFromString($zip_file_name, $file); } + $filename = date('Y-m-d').'_'.str_replace(' ', '_', trans('texts.invoices')).'.zip'; $filepath = sys_get_temp_dir().'/'.$filename; diff --git a/resources/views/portal/ninja2020/invoices/index.blade.php b/resources/views/portal/ninja2020/invoices/index.blade.php index b9e95ba914bc..7b9dabe1a591 100644 --- a/resources/views/portal/ninja2020/invoices/index.blade.php +++ b/resources/views/portal/ninja2020/invoices/index.blade.php @@ -17,7 +17,6 @@ @csrf @csrf - @if(!empty(auth()->user()->client->service()->getPaymentMethods(0))) @endif