mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 13:12:50 +01:00
Merge pull request #7548 from turbo124/v5-develop
MInor fixes for correct disk configuration
This commit is contained in:
commit
4faaeb1797
@ -70,7 +70,7 @@ class CreateEntityPdf implements ShouldQueue
|
||||
*
|
||||
* @param $invitation
|
||||
*/
|
||||
public function __construct($invitation, $disk = 'public')
|
||||
public function __construct($invitation, $disk = null)
|
||||
{
|
||||
$this->invitation = $invitation;
|
||||
|
||||
@ -99,7 +99,7 @@ class CreateEntityPdf implements ShouldQueue
|
||||
$this->client = $invitation->contact->client;
|
||||
$this->client->load('company');
|
||||
|
||||
$this->disk = Ninja::isHosted() ? config('filesystems.default') : $disk;
|
||||
$this->disk = $disk ?? config('filesystems.default');
|
||||
|
||||
}
|
||||
|
||||
|
@ -49,8 +49,6 @@ class GenerateDeliveryNote
|
||||
|
||||
$this->contact = $contact;
|
||||
|
||||
// $this->disk = 'public';
|
||||
|
||||
$this->disk = $disk ?? config('filesystems.default');
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user