diff --git a/app/Mail/ClientContact/ClientContactResetPasswordObject.php b/app/Mail/ClientContact/ClientContactResetPasswordObject.php index 3f3971bee0..5306988c30 100644 --- a/app/Mail/ClientContact/ClientContactResetPasswordObject.php +++ b/app/Mail/ClientContact/ClientContactResetPasswordObject.php @@ -39,6 +39,7 @@ class ClientContactResetPasswordObject 'button' => ctrans('texts.reset'), 'signature' => $this->company->settings->email_signature, 'settings' => $this->company->settings, + 'company' => $this->company, 'logo' => $this->company->present()->logo(), ]; @@ -46,9 +47,9 @@ class ClientContactResetPasswordObject $mail_obj = new \stdClass; $mail_obj->subject = ctrans('texts.your_password_reset_link'); $mail_obj->data = $data; - $mail_obj->markdown = 'email.admin.generic'; + $mail_obj->markdown = 'email.client.generic'; $mail_obj->tag = $this->company->company_key; return $mail_obj; } -} \ No newline at end of file +} diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index ae5560f6fd..08366293e5 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4261,6 +4261,7 @@ $LANG = array( '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:', + 'client_email_company_contact_label' => 'If you have any questions please contact us, we\'re here to help!', ); return $LANG; diff --git a/resources/views/email/client/generic.blade.php b/resources/views/email/client/generic.blade.php new file mode 100644 index 0000000000..335e2ed026 --- /dev/null +++ b/resources/views/email/client/generic.blade.php @@ -0,0 +1,27 @@ +@component('email.template.client', ['design' => 'light', 'settings' => $settings, 'logo' => $logo, 'company' => $company ?? '']) +
+ @isset($greeting) +

{{ $greeting }}

+ @endisset + + @isset($title) +

{{ $title }}

+ @endisset + + @isset($h2) +

{{ $title }}

+ @endisset + +
+ {{ $content }} +
+ + @isset($additional_info) +

{{ $additional_info }}

+ @endisset + + @isset($url) + {{ ctrans($button) }} + @endisset +
+@endcomponent diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php new file mode 100644 index 0000000000..34882974eb --- /dev/null +++ b/resources/views/email/template/client.blade.php @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + + + + + + @if(isset($company) & $company instanceof \App\Models\Company) + + + + @endif + + + + +
+
+ + +
+
+
+
+ + {{ $slot }} +
+
+
+

+ {{ ctrans('texts.client_email_company_contact_label') }} +

+

+ {{ $company->present()->name() }}

+

+ {{ $company->settings->phone }} + {{ $company->settings->website }} +

+
+
+
+ @if(isset($company) && !$company->account->isPaid()) +

© {{ date('Y') }} Invoice Ninja, All + Rights Reserved +

+ @endif +
+
+
+ + +