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

Document permissions

Browse Source
This commit is contained in:
David Bomba 2020-08-12 13:13:39 +10:00
parent de24d00315
commit e347c5ad51
9 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortal/DocumentController.php
View File

@ -49,7 +49,7 @@ class DocumentController extends Controller
{ {
$contact = auth()->user(); $contact = auth()->user();
Storage::makeDirectory('public/' . $contact->client->client_hash, 0755); Storage::makeDirectory('public/' . $contact->client->client_hash, 0775);
$path = Storage::putFile('public/' . $contact->client->client_hash, $request->file('file')); $path = Storage::putFile('public/' . $contact->client->client_hash, $request->file('file'));

2
app/Jobs/Credit/CreateCreditPdf.php
View File

@ -87,7 +87,7 @@ class CreateCreditPdf implements ShouldQueue
$html = (new HtmlEngine($designer, $this->invitation, 'credit'))->build(); $html = (new HtmlEngine($designer, $this->invitation, 'credit'))->build();
Storage::makeDirectory($path, 0755); Storage::makeDirectory($path, 0775);
$pdf = $this->makePdf(null, null, $html); $pdf = $this->makePdf(null, null, $html);

2
app/Jobs/Invoice/CreateInvoicePdf.php
View File

@ -86,7 +86,7 @@ class CreateInvoicePdf implements ShouldQueue
$html = (new HtmlEngine($designer, $this->invitation, 'invoice'))->build(); $html = (new HtmlEngine($designer, $this->invitation, 'invoice'))->build();
//todo - move this to the client creation stage so we don't keep hitting this unnecessarily //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
Storage::makeDirectory($path, 0755); Storage::makeDirectory($path, 0775);
$pdf = $this->makePdf(null, null, $html); $pdf = $this->makePdf(null, null, $html);

2
app/Jobs/Quote/CreateQuotePdf.php
View File

@ -84,7 +84,7 @@ class CreateQuotePdf implements ShouldQueue
$designer = new Designer($this->quote, $design, $this->quote->client->getSetting('pdf_variables'), 'quote'); $designer = new Designer($this->quote, $design, $this->quote->client->getSetting('pdf_variables'), 'quote');
//todo - move this to the client creation stage so we don't keep hitting this unnecessarily //todo - move this to the client creation stage so we don't keep hitting this unnecessarily
Storage::makeDirectory($path, 0755); Storage::makeDirectory($path, 0775);
$html = (new HtmlEngine($designer, $this->invitation, 'quote'))->build(); $html = (new HtmlEngine($designer, $this->invitation, 'quote'))->build();

2
app/Jobs/Util/UploadAvatar.php
View File

@ -39,7 +39,7 @@ class UploadAvatar implements ShouldQueue
{ {
//make dir //make dir
Storage::makeDirectory('public/' . $this->directory, 0755); Storage::makeDirectory('public/' . $this->directory, 0775);
$tmp_file = sha1(time()).".png"; $tmp_file = sha1(time()).".png";

2
app/Models/Activity.php
View File

@ -76,7 +76,7 @@ class Activity extends StaticModel
const PAID_INVOICE=54; // const PAID_INVOICE=54; //
const EMAIL_INVOICE_FAILED=57; const EMAIL_INVOICE_FAILED=57;
const REVERSED_INVOICE=58; // const REVERSED_INVOICE=58; //
const CANCELLED_INVOICE=59; const CANCELLED_INVOICE=59; //
const VIEW_CREDIT=60; // const VIEW_CREDIT=60; //
protected $casts = [ protected $casts = [

2
app/Utils/PhantomJS/Phantom.php
View File

@ -63,7 +63,7 @@ class Phantom
$phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$url}%22,renderType:%22pdf%22%7D"; $phantom_url = "https://phantomjscloud.com/api/browser/v2/{$key}/?request=%7Burl:%22{$url}%22,renderType:%22pdf%22%7D";
$pdf = \App\Utils\CurlUtils::get($phantom_url); $pdf = \App\Utils\CurlUtils::get($phantom_url);
Storage::makeDirectory($path, 0755); Storage::makeDirectory($path, 0775);
$instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf); $instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf);

20
config/filesystems.php
View File

@ -46,6 +46,16 @@ return [
'local' => [ 'local' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app'), 'root' => storage_path('app'),
'permissions' => [
'file' => [
'public' => 0664,
'private' => 0600,
],
'dir' => [
'public' => 0777,
'private' => 0700,
],
],
], ],
'public' => [ 'public' => [
@ -53,6 +63,16 @@ return [
'root' => storage_path('app/public'), 'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage', 'url' => env('APP_URL').'/storage',
'visibility' => 'public', 'visibility' => 'public',
'permissions' => [
'file' => [
'public' => 0664,
'private' => 0600,
],
'dir' => [
'public' => 0777,
'private' => 0700,
],
],
], ],
's3' => [ 's3' => [

3
tests/Integration/DesignTest.php
View File

@ -65,7 +65,8 @@ class DesignTest extends TestCase
$this->invoice->uses_inclusive_taxes = false; $this->invoice->uses_inclusive_taxes = false;
$this->invoice->service()->createInvitations()->markSent()->save(); $this->invoice->service()->createInvitations()->markSent()->applyNumber()->save();
$this->invoice->fresh(); $this->invoice->fresh();
$this->invoice->load('invitations'); $this->invoice->load('invitations');