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

Fix translations for import email

Browse Source
This commit is contained in:
David Bomba 2021-08-02 09:20:38 +10:00
parent 1d58a87a24
commit bce7667aa5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Jobs/Util/Import.php
View File

@ -91,6 +91,7 @@ use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Turbo124\Beacon\Facades\LightLogs; use Turbo124\Beacon\Facades\LightLogs;
use Illuminate\Support\Facades\App;
class Import implements ShouldQueue class Import implements ShouldQueue
{ {
@ -244,6 +245,10 @@ class Import implements ShouldQueue
// $this->fixData(); // $this->fixData();
try{ try{
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($this->company->settings));
Mail::to($this->user->email, $this->user->name()) Mail::to($this->user->email, $this->user->name())
->send(new MigrationCompleted($this->company, implode("<br>",$check_data))); ->send(new MigrationCompleted($this->company, implode("<br>",$check_data)));
} }

2
app/Repositories/ActivityRepository.php
View File

@ -125,7 +125,7 @@ class ActivityRepository extends BaseRepository
$design = Design::find($entity_design_id); $design = Design::find($entity_design_id);
if(!$entity->invitations()->exists()){ if(!$entity->invitations()->exists() || !$design){
nlog("No invitations for entity {$entity->id} - {$entity->number}"); nlog("No invitations for entity {$entity->id} - {$entity->number}");
return; return;
} }