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

Minor changes to migration

Browse Source
This commit is contained in:
David Bomba 2020-11-30 09:58:31 +11:00
parent f2f8837269
commit 1210a81a09
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/MigrationController.php
View File

@ -321,7 +321,7 @@ class MigrationController extends BaseController
->storeAs( ->storeAs(
'migrations', 'migrations',
$request->file($company->company_index)->getClientOriginalName(), $request->file($company->company_index)->getClientOriginalName(),
'local' 'public'
); );
if (app()->environment() == 'testing') { if (app()->environment() == 'testing') {

6
app/Jobs/Util/StartMigration.php
View File

@ -85,7 +85,7 @@ class StartMigration implements ShouldQueue
$this->company->save(); $this->company->save();
$zip = new ZipArchive(); $zip = new ZipArchive();
$archive = $zip->open(storage_path("app/{$this->filepath}")); $archive = $zip->open(public_path("storage/{$this->filepath}"));
$filename = pathinfo($this->filepath, PATHINFO_FILENAME); $filename = pathinfo($this->filepath, PATHINFO_FILENAME);
try { try {
@ -93,14 +93,14 @@ class StartMigration implements ShouldQueue
throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.'); throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.');
} }
$zip->extractTo(storage_path("app/migrations/{$filename}")); $zip->extractTo(public_path("storage/migrations/{$filename}"));
$zip->close(); $zip->close();
if (app()->environment() == 'testing') { if (app()->environment() == 'testing') {
return true; return true;
} }
$file = storage_path("app/migrations/$filename/migration.json"); $file = public_path("storage/migrations/$filename/migration.json");
if (! file_exists($file)) { if (! file_exists($file)) {
throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.'); throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.');