diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index af0524c45078..3730221b48f9 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -99,8 +99,6 @@ class StartMigration implements ShouldQueue return true; } - $this->company->setMigration(true); - $file = storage_path("migrations/$filename/migration.json"); if (! file_exists($file)) { @@ -111,9 +109,7 @@ class StartMigration implements ShouldQueue Import::dispatchNow($data, $this->company, $this->user); - $this->company->setMigration(false); } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) { - $this->company->setMigration(false); Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage())); diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index 112a0f1b9047..582dd5165d55 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -320,6 +320,7 @@ class BaseRepository $model->design_id = $this->decodePrimaryKey($client->getSetting('invoice_design_id')); } + //links tasks and expenses back to the invoice. $model->service()->linkEntities()->save(); } diff --git a/tests/Unit/Migration/migration.json b/tests/Unit/Migration/migration.json index b377a58d5d6d..1307746a43b5 100644 --- a/tests/Unit/Migration/migration.json +++ b/tests/Unit/Migration/migration.json @@ -23,7 +23,7 @@ "invoice2": "surcharge2" }, "created_at": "2020-06-30", - "updated_at": "2020-10-30", + "updated_at": "2020-11-01", "settings": { "timezone_id": "15", "date_format_id": "1",