From e70effd4048a6c2c495eab1924fabd9396155986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Wed, 9 Jun 2021 17:25:59 +0200 Subject: [PATCH] app/Mail/MigrationFailed.php --- app/Mail/MigrationFailed.php | 19 +++++++++++-------- resources/lang/en/texts.php | 2 ++ .../views/email/migration/failed.blade.php | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php index 54002a5220dd..9c28bd2fbc27 100644 --- a/app/Mail/MigrationFailed.php +++ b/app/Mail/MigrationFailed.php @@ -2,28 +2,27 @@ namespace App\Mail; -use Illuminate\Bus\Queueable; +use App\Models\Company; use Illuminate\Mail\Mailable; -use Illuminate\Queue\SerializesModels; class MigrationFailed extends Mailable { - public $exception; + public $content; - public $settings; + public $company; + /** * Create a new message instance. * * @param $content * @param $exception */ - public function __construct($exception, $company, $content = null) + public function __construct($exception, Company $company, $content = null) { $this->exception = $exception; $this->content = $content; - $this->settings = $company->settings; $this->company = $company; } @@ -34,7 +33,11 @@ class MigrationFailed extends Mailable */ public function build() { - return $this->from(config('mail.from.address'), config('mail.from.name')) - ->view('email.migration.failed', ['settings' => $this->settings, 'company' => $this->company]); + return $this + ->from(config('mail.from.address'), config('mail.from.name')) + ->view('email.migration.failed', [ + 'logo' => $this->company->present()->logo(), + 'settings' => $this->company->settings, + ]); } } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index f3a8e3b9d1b0..ae5560f6fd4a 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4259,6 +4259,8 @@ $LANG = array( 'login_link_requested_label' => 'Login link requested', 'login_link_requested' => 'There was a request to login using link. If you did not request this, it\'s safe to ignore it.', 'invoices_backup_subject' => 'Your invoices are ready for download', + 'migration_failed_label' => 'Migration failed', + 'migration_failed' => 'Looks like something went wrong with the migration for the following company:', ); return $LANG; diff --git a/resources/views/email/migration/failed.blade.php b/resources/views/email/migration/failed.blade.php index 79dca9db09c5..a573faa70680 100644 --- a/resources/views/email/migration/failed.blade.php +++ b/resources/views/email/migration/failed.blade.php @@ -1,7 +1,7 @@ -@component('email.template.admin-light', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png', 'settings' => $settings]) +@component('email.template.admin', ['logo' => $logo, 'settings' => $settings])
-

Whoops, migration failed for {{ $company->present()->name() }}.

-

Looks like your migration failed. Here's the error message:

+

{{ ctrans('texts.migration_failed_label') }}

+

{{ ctrans('texts.migration_failed') }} {{ $company->present()->name() }}

     	    @if(\App\Utils\Ninja::isHosted())