Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 08:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8694 from turbo124/v5-develop

Browse Source 
Fixes for unlinking company exports
This commit is contained in:
David Bomba 2023-08-06 15:36:12 +10:00 committed by GitHub
commit 9af4d3fe6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/PreviewController.php
View File

@ -188,19 +188,19 @@ class PreviewController extends BaseController
if ($request->input('entity') == 'quote') { if ($request->input('entity') == 'quote') {
$repo = new QuoteRepository(); $repo = new QuoteRepository();
$entity_obj = QuoteFactory::create($company->id, auth()->user()->id); $entity_obj = QuoteFactory::create($company->id, $user->id);
$class = Quote::class; $class = Quote::class;
} elseif ($request->input('entity') == 'credit') { } elseif ($request->input('entity') == 'credit') {
$repo = new CreditRepository(); $repo = new CreditRepository();
$entity_obj = CreditFactory::create($company->id, auth()->user()->id); $entity_obj = CreditFactory::create($company->id, $user->id);
$class = Credit::class; $class = Credit::class;
} elseif ($request->input('entity') == 'recurring_invoice') { } elseif ($request->input('entity') == 'recurring_invoice') {
$repo = new RecurringInvoiceRepository(); $repo = new RecurringInvoiceRepository();
$entity_obj = RecurringInvoiceFactory::create($company->id, auth()->user()->id); $entity_obj = RecurringInvoiceFactory::create($company->id, $user->id);
$class = RecurringInvoice::class; $class = RecurringInvoice::class;
} else { //assume it is either an invoice or a null object } else { //assume it is either an invoice or a null object
$repo = new InvoiceRepository(); $repo = new InvoiceRepository();
$entity_obj = InvoiceFactory::create($company->id, auth()->user()->id); $entity_obj = InvoiceFactory::create($company->id, $user->id);
$class = Invoice::class; $class = Invoice::class;
} }

8
app/Jobs/Company/CompanyExport.php
View File

@ -460,7 +460,9 @@ class CompanyExport implements ShouldQueue
$zip->close(); $zip->close();
Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path)); Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path));
unlink($zip_path);
if(file_exists($zip_path))
unlink($zip_path);
if(Ninja::isSelfHost()) if(Ninja::isSelfHost())
$storage_path = 'backups/'.$file_name; $storage_path = 'backups/'.$file_name;
@ -489,7 +491,9 @@ class CompanyExport implements ShouldQueue
if (Ninja::isHosted()) { if (Ninja::isHosted()) {
sleep(3); sleep(3);
unlink($zip_path);
if(file_exists($zip_path))
unlink($zip_path);
} }
} }
} }