diff --git a/app/Mail/ExistingMigration.php b/app/Mail/ExistingMigration.php index f6c80d14e047..449b8dbfdc8c 100644 --- a/app/Mail/ExistingMigration.php +++ b/app/Mail/ExistingMigration.php @@ -5,6 +5,7 @@ namespace App\Mail; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; +use Illuminate\Support\Facades\App; class ExistingMigration extends Mailable { @@ -35,6 +36,8 @@ class ExistingMigration extends Mailable */ public function build() { + App::setLocale($this->company->getLocale()); + $this->settings = $this->company->settings; $this->logo = $this->company->present()->logo(); $this->company_name = $this->company->present()->name(); diff --git a/app/Mail/MigrationCompleted.php b/app/Mail/MigrationCompleted.php index 09fa1c8319f2..19374f757e32 100644 --- a/app/Mail/MigrationCompleted.php +++ b/app/Mail/MigrationCompleted.php @@ -39,6 +39,7 @@ class MigrationCompleted extends Mailable App::forgetInstance('translator'); $t = app('translator'); $t->replace(Ninja::transformTranslations($this->company->settings)); + App::setLocale($this->company->getLocale()); $data['settings'] = $this->company->settings; $data['company'] = $this->company->fresh(); diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php index 55d6f0838916..409e843b2042 100644 --- a/app/Mail/MigrationFailed.php +++ b/app/Mail/MigrationFailed.php @@ -4,6 +4,7 @@ namespace App\Mail; use App\Models\Company; use Illuminate\Mail\Mailable; +use Illuminate\Support\Facades\App; class MigrationFailed extends Mailable { @@ -35,6 +36,8 @@ class MigrationFailed extends Mailable */ public function build() { + App::setLocale($this->company->getLocale()); + return $this ->from(config('mail.from.address'), config('mail.from.name')) ->view('email.migration.failed', [ diff --git a/app/Services/Invoice/MarkSent.php b/app/Services/Invoice/MarkSent.php index a7d0488ce887..7527ab633b1f 100644 --- a/app/Services/Invoice/MarkSent.php +++ b/app/Services/Invoice/MarkSent.php @@ -26,6 +26,7 @@ class MarkSent extends AbstractService public function __construct(Client $client, Invoice $invoice) { $this->client = $client; + $this->invoice = $invoice; }