diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 94ab88c5123d..dad349fde609 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -25,6 +25,7 @@ use App\Utils\Ninja; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Http\Request; use Illuminate\Support\Str; +use Illuminate\Support\Facades\App; class MigrationController extends BaseController { @@ -263,6 +264,10 @@ class MigrationController extends BaseController // Look for possible existing company (based on company keys). $existing_company = Company::whereRaw('BINARY `company_key` = ?', [$company->company_key])->first(); + App::forgetInstance('translator'); + $t = app('translator'); + $t->replace(Ninja::transformTranslations($user->account->companies()->first()->settings)); + if(!$existing_company && $company_count >=10) { $nmo = new NinjaMailerObject; diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 664c09afa9b1..4ee2ab0d4e19 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -262,8 +262,6 @@ class Import implements ShouldQueue /*After a migration first some basic jobs to ensure the system is up to date*/ VersionCheck::dispatch(); - - // CreateCompanyPaymentTerms::dispatchNow($sp035a66, $spaa9f78); // CreateCompanyTaskStatuses::dispatchNow($this->company, $this->user); diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index b4e54a07dc1c..b7d8654b0954 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -29,6 +29,7 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Storage; use ZipArchive; +use Illuminate\Support\Facades\App; class StartMigration implements ShouldQueue { @@ -122,6 +123,10 @@ class StartMigration implements ShouldQueue $this->company->update_products = $update_product_flag; $this->company->save(); + App::forgetInstance('translator'); + $t = app('translator'); + $t->replace(Ninja::transformTranslations($this->company->settings)); + } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing | \Exception $e) { $this->company->update_products = $update_product_flag;