Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7548 from turbo124/v5-develop

Browse Source 
MInor fixes for correct disk configuration
This commit is contained in:
David Bomba 2022-06-13 09:40:20 +10:00 committed by GitHub
commit 4faaeb1797
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -70,7 +70,7 @@ class CreateEntityPdf implements ShouldQueue
* *
* @param $invitation * @param $invitation
*/ */
public function __construct($invitation, $disk = 'public') public function __construct($invitation, $disk = null)
{ {
$this->invitation = $invitation; $this->invitation = $invitation;
@ -99,7 +99,7 @@ class CreateEntityPdf implements ShouldQueue
$this->client = $invitation->contact->client; $this->client = $invitation->contact->client;
$this->client->load('company'); $this->client->load('company');
$this->disk = Ninja::isHosted() ? config('filesystems.default') : $disk; $this->disk = $disk ?? config('filesystems.default');
} }

2
app/Services/Invoice/GenerateDeliveryNote.php
View File

@ -49,8 +49,6 @@ class GenerateDeliveryNote
$this->contact = $contact; $this->contact = $contact;
// $this->disk = 'public';
$this->disk = $disk ?? config('filesystems.default'); $this->disk = $disk ?? config('filesystems.default');
} }