Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 03:04:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5782 from turbo124/v5-develop

Browse Source 
Enable previewing Recurring invoice pdfs
This commit is contained in:
David Bomba 2021-05-22 13:09:55 +10:00 committed by GitHub
commit 31c5f36a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Services/Recurring/GetInvoicePdf.php
View File

@ -41,7 +41,7 @@ class GetInvoicePdf extends AbstractService
$file_path = $path.$this->entity->hashed_id.'.pdf'; $file_path = $path.$this->entity->hashed_id.'.pdf';
$disk = config('filesystems.default'); $disk = 'public';
$file = Storage::disk($disk)->exists($file_path); $file = Storage::disk($disk)->exists($file_path);
@ -49,12 +49,6 @@ class GetInvoicePdf extends AbstractService
$file_path = CreateEntityPdf::dispatchNow($invitation); $file_path = CreateEntityPdf::dispatchNow($invitation);
} }
/* Copy from remote disk to local when using cloud file storage. */
if(config('filesystems.default') == 's3')
return TempFile::path(Storage::disk($disk)->url($file_path));
// return Storage::disk($disk)->url($file_path);
return Storage::disk($disk)->path($file_path); return Storage::disk($disk)->path($file_path);
} }
} }