diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index ca17e3970cf1..35f691762c2a 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -320,7 +320,8 @@ class MigrationController extends BaseController $migration_file = $request->file($company->company_index) ->storeAs( 'migrations', - $request->file($company->company_index)->getClientOriginalName() + $request->file($company->company_index)->getClientOriginalName(), + 'local' ); if (app()->environment() == 'testing') { @@ -328,7 +329,9 @@ class MigrationController extends BaseController } try { - StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5)); + // StartMigration::dispatch(base_path("storage/app/public/$migration_file"), $user, $fresh_company)->delay(now()->addSeconds(5)); + info($migration_file); + StartMigration::dispatch($migration_file, $user, $fresh_company); } catch (\Exception $e) { info($e->getMessage()); } diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index 78eabfe608da..17cefe69ee07 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -85,8 +85,7 @@ class StartMigration implements ShouldQueue $this->company->save(); $zip = new ZipArchive(); - $archive = $zip->open($this->filepath); - + $archive = $zip->open(storage_path("app/{$this->filepath}")); $filename = pathinfo($this->filepath, PATHINFO_FILENAME); try { @@ -94,14 +93,14 @@ class StartMigration implements ShouldQueue throw new ProcessingMigrationArchiveFailed('Processing migration archive failed. Migration file is possibly corrupted.'); } - $zip->extractTo(storage_path("migrations/{$filename}")); + $zip->extractTo(storage_path("app/migrations/{$filename}")); $zip->close(); if (app()->environment() == 'testing') { return true; } - $file = storage_path("migrations/$filename/migration.json"); + $file = storage_path("app/migrations/$filename/migration.json"); if (! file_exists($file)) { throw new NonExistingMigrationFile('Migration file does not exist, or it is corrupted.');