mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-08 05:54:29 -04:00
Update e-mail templates
Removed fedeisas/laravel-mail-css-inliner
This commit is contained in:
Benjamin Beganović
parent
9471305021
commit
b8d8f977cc
@ -38,7 +38,6 @@
|
||||
"composer/composer": "^2",
|
||||
"czproject/git-php": "^3.17",
|
||||
"doctrine/dbal": "^2.10",
|
||||
"fedeisas/laravel-mail-css-inliner": "^3",
|
||||
"fideloper/proxy": "^4.2",
|
||||
"fzaninotto/faker": "^1.4",
|
||||
"google/apiclient": "^2.7",
|
||||
|
||||
62
composer.lock
generated
62
composer.lock
generated
@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "0afe2d541cb6e16cfb9d29faf3425c2d",
|
||||
"content-hash": "94ab2953278081e3fdf663e1e7cf14c4",
|
||||
"packages": [
|
||||
{
|
||||
"name": "asgrim/ofxparser",
|
||||
@ -1657,66 +1657,6 @@
|
||||
],
|
||||
"time": "2020-12-29T14:50:06+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fedeisas/laravel-mail-css-inliner",
|
||||
"version": "3.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/fedeisas/laravel-mail-css-inliner.git",
|
||||
"reference": "263f395b46ef9666151ac78daf429632b0b2e2c3"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/fedeisas/laravel-mail-css-inliner/zipball/263f395b46ef9666151ac78daf429632b0b2e2c3",
|
||||
"reference": "263f395b46ef9666151ac78daf429632b0b2e2c3",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-dom": "*",
|
||||
"illuminate/mail": "^7.4 || ^8.0",
|
||||
"illuminate/support": "^7.4 || ^8.0",
|
||||
"php": "^7.2.5",
|
||||
"tijsverkoyen/css-to-inline-styles": "~2.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^8.5",
|
||||
"swiftmailer/swiftmailer": "^6.0"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"laravel": {
|
||||
"providers": [
|
||||
"Fedeisas\\LaravelMailCssInliner\\LaravelMailCssInlinerServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Fedeisas\\LaravelMailCssInliner\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Fede Isas",
|
||||
"email": "fedeisas@hotmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Inline the CSS of your HTML emails using Laravel",
|
||||
"keywords": [
|
||||
"css",
|
||||
"laravel",
|
||||
"mailer"
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/fedeisas/laravel-mail-css-inliner/issues",
|
||||
"source": "https://github.com/fedeisas/laravel-mail-css-inliner/tree/3.1"
|
||||
},
|
||||
"time": "2020-09-12T05:00:14+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fideloper/proxy",
|
||||
"version": "4.4.1",
|
||||
|
||||
@ -1,22 +1,19 @@
|
||||
@component('email.template.master', ['design' => 'light'])
|
||||
@component('email.template.master', ['design' => 'light', 'whitelabel' => false])
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header', ['p' => '', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
||||
Hello!
|
||||
@endcomponent
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
@endslot
|
||||
<p>You are receiving this email because we received a password reset request for your account.</p>
|
||||
|
||||
You are receiving this email because we received a password reset request for your account.
|
||||
|
||||
@component('email.components.button', ['url' => $link, 'show_link' => true])
|
||||
<a href="{{ $link }}" target="_blank" class="button">
|
||||
Reset Password
|
||||
@endcomponent
|
||||
</a>
|
||||
|
||||
<p>
|
||||
If you’re having trouble clicking the "Reset Password" button, copy and paste the URL below into your web
|
||||
browser:
|
||||
</p>
|
||||
|
||||
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
|
||||
If you’re having trouble clicking the "Reset Password" button, copy and paste the URL below into your web browser:
|
||||
<a href="{{ $link }}">{{ $link }}</a>
|
||||
@endcomponent
|
||||
|
||||
@endcomponent
|
||||
@ -1,35 +1,12 @@
|
||||
@component('mail::layout')
|
||||
|
||||
{{-- Header --}}
|
||||
@slot('header')
|
||||
@component('mail::header', ['url' => config('app.url')])
|
||||
Header Title
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
{{-- Body --}}
|
||||
{{ $user }}
|
||||
trans('texts.confirmation_message')
|
||||
|
||||
@component('mail::button', ['url' => url("/user/confirm/{$user->confirmation_code}")])
|
||||
trans('texts.confirm')
|
||||
@endcomponent
|
||||
|
||||
{{-- Subcopy --}}
|
||||
@isset($subcopy)
|
||||
@slot('subcopy')
|
||||
@component('mail::subcopy')
|
||||
{{ $subcopy }}
|
||||
@endcomponent
|
||||
@endslot
|
||||
@endisset
|
||||
|
||||
|
||||
{{-- Footer --}}
|
||||
@slot('footer')
|
||||
@component('mail::footer')
|
||||
© {{ date('Y') }} {{ config('ninja.app_name') }}.
|
||||
@endcomponent
|
||||
@endslot
|
||||
@component('email.template.master', ['design' => 'light', 'whitelabel' => false])
|
||||
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
<p>{{ ctrans('texts.confirmation_message') }}</p>
|
||||
|
||||
<a href="{{ url("/user/confirm/{$user->confirmation_code}") }}" target="_blank" class="button">
|
||||
{{ ctrans('texts.confirm') }}
|
||||
</a>
|
||||
@endcomponent
|
||||
@ -1,25 +1,16 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header')
|
||||
Import completed
|
||||
@endcomponent
|
||||
@endslot
|
||||
<h1>Import completed</h1>
|
||||
<p>Hello, here is the output of your recent import job.</p>
|
||||
|
||||
@slot('greeting')
|
||||
Hello,
|
||||
@endslot
|
||||
|
||||
Here is the output of your recent import job. <br><br>
|
||||
|
||||
@if(isset($clients) && count($clients) >=1)
|
||||
|
||||
<h3>Clients Imported: {{ count($clients) }} </h3>
|
||||
|
||||
@endif
|
||||
|
||||
@if(isset($errors['clients']) && count($errors['clients']) >=1)
|
||||
@if(isset($clients) && count($clients) >=1)
|
||||
<h3>Clients Imported: {{ count($clients) }} </h3>
|
||||
@endif
|
||||
|
||||
@if(isset($errors['clients']) && count($errors['clients']) >=1)
|
||||
<h3>Client Errors</h3>
|
||||
|
||||
<ul>
|
||||
@ -27,16 +18,15 @@ Here is the output of your recent import job. <br><br>
|
||||
<li>{{ $error['client'] }} - {{ $error['error'] }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if(isset($invoices) && count($invoices) >=1)
|
||||
@if(isset($invoices) && count($invoices) >=1)
|
||||
|
||||
<h3>Invoices Imported: {{ count($invoices) }} </h3>
|
||||
<h3>Invoices Imported: {{ count($invoices) }} </h3>
|
||||
|
||||
@endif
|
||||
|
||||
@if(isset($errors['invoices']) && count($errors['invoices']) >=1)
|
||||
@endif
|
||||
|
||||
@if(isset($errors['invoices']) && count($errors['invoices']) >=1)
|
||||
<h3>Invoices Errors</h3>
|
||||
|
||||
<ul>
|
||||
@ -44,16 +34,13 @@ Here is the output of your recent import job. <br><br>
|
||||
<li>{{ $error['invoice'] }} - {{ $error['error'] }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if(isset($products) && count($products) >=1)
|
||||
|
||||
<h3>Products Imported: {{ count($products) }} </h3>
|
||||
|
||||
@endif
|
||||
|
||||
@if(isset($errors['products']) && count($errors['products']) >=1)
|
||||
@if(isset($products) && count($products) >=1)
|
||||
<h3>Products Imported: {{ count($products) }} </h3>
|
||||
@endif
|
||||
|
||||
@if(isset($errors['products']) && count($errors['products']) >=1)
|
||||
<h3>Client Errors</h3>
|
||||
|
||||
<ul>
|
||||
@ -61,22 +48,9 @@ Here is the output of your recent import job. <br><br>
|
||||
<li>{{ $error['product'] }} - {{ $error['error'] }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
@endif
|
||||
|
||||
@component('email.components.button', ['url' => url('/')])
|
||||
Visit portal
|
||||
@endcomponent
|
||||
|
||||
|
||||
@slot('signature')
|
||||
Thank you, <br>
|
||||
Invoice Ninja
|
||||
@endslot
|
||||
|
||||
@slot('footer')
|
||||
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
|
||||
For any info, please visit InvoiceNinja.
|
||||
@endcomponent
|
||||
@endslot
|
||||
@endif
|
||||
|
||||
<a href="{{ url('/') }}" target="_blank" class="button">Visit portal</a>
|
||||
|
||||
<p>Thank you, <br/> Invoice Ninja.</p>
|
||||
@endcomponent
|
||||
@ -1,26 +1,10 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header', ['p' => 'Payment for your invoice has been completed!', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
||||
Invoice paid
|
||||
@endcomponent
|
||||
|
||||
@endslot
|
||||
|
||||
@slot('greeting')
|
||||
Hello,
|
||||
@endslot
|
||||
|
||||
We want to inform you that payment was completed for your invoice. Amount: $10,000.00.
|
||||
|
||||
@component('email.components.button', ['url' => 'https://invoiceninja.com', 'show_link' => true])
|
||||
Visit InvoiceNinja
|
||||
@endcomponent
|
||||
|
||||
@slot('below_card')
|
||||
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
|
||||
For any info, please visit InvoiceNinja.
|
||||
@endcomponent
|
||||
@endslot
|
||||
<h1>Payment for your invoice has been completed!</h1>
|
||||
<p>We want to inform you that payment was completed for your invoice.</p>
|
||||
|
||||
<a href="https://invoiceninja.com" target="_blank" class="button">Visit Invoice Ninja</a>
|
||||
@endcomponent
|
||||
@ -1,31 +1,13 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header')
|
||||
Migration completed
|
||||
@endcomponent
|
||||
@endslot
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
@slot('greeting')
|
||||
Hello,
|
||||
@endslot
|
||||
<h1>Migration completed</h1>
|
||||
<p>We're happy to inform you that migration has been completed successfully. It is ready for you to review it.</p>
|
||||
|
||||
We're happy to inform you that migration has been completed successfully. It is ready for you to review it.
|
||||
|
||||
@component('email.components.button', ['url' => url('/')])
|
||||
Visit portal
|
||||
@endcomponent
|
||||
|
||||
|
||||
@slot('signature')
|
||||
Thank you, <br>
|
||||
Invoice Ninja
|
||||
@endslot
|
||||
|
||||
@slot('footer')
|
||||
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
|
||||
For any info, please visit InvoiceNinja.
|
||||
@endcomponent
|
||||
@endslot
|
||||
<a href="{{ url('/') }}" target="_blank" class="button">Visit portal</a>
|
||||
|
||||
<p>Thank you, <br/> Invoice Ninja</p>
|
||||
@endcomponent
|
||||
@ -1,4 +1,4 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header')
|
||||
|
||||
@ -1,7 +1,13 @@
|
||||
Whoops!
|
||||
Looks like your migration failed.
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
<pre>
|
||||
<h1>Whoops, migration failed.</h1>
|
||||
<p>Looks like your migration failed. Here's the error message:</p>
|
||||
|
||||
<pre>
|
||||
{!! $exception->getMessage() !!}
|
||||
{!! $content !!}
|
||||
</pre>
|
||||
</pre>
|
||||
@endcomponent
|
||||
|
||||
@ -1,26 +1,10 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header', ['p' => 'Your quote was approved!', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
|
||||
Quote approved
|
||||
@endcomponent
|
||||
|
||||
@endslot
|
||||
|
||||
@slot('greeting')
|
||||
Hello,
|
||||
@endslot
|
||||
|
||||
We want to inform you that quote was approved. Put nicer text here.
|
||||
|
||||
@component('email.components.button', ['url' => 'https://invoiceninja.com', 'show_link' => true])
|
||||
Visit InvoiceNinja
|
||||
@endcomponent
|
||||
|
||||
@slot('below_card')
|
||||
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '© InvoiceNinja'])
|
||||
For any info, please visit InvoiceNinja.
|
||||
@endcomponent
|
||||
@endslot
|
||||
<h1>Quote approved!</h1>
|
||||
<p>We want to inform you that quote was approved.</p>
|
||||
|
||||
<a href="https://invoiceninja.com" target="_blank" class="button">Visit Invoice Ninja</a>
|
||||
@endcomponent
|
||||
@ -1,30 +1,7 @@
|
||||
@component('mail::layout')
|
||||
|
||||
{{-- Header --}}
|
||||
@slot('header')
|
||||
@component('mail::header', ['url' => config('app.url')])
|
||||
Header Title
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
{{-- Body --}}
|
||||
{{ $message }}
|
||||
|
||||
{{-- Subcopy --}}
|
||||
@isset($subcopy)
|
||||
@slot('subcopy')
|
||||
@component('mail::subcopy')
|
||||
{{ $subcopy }}
|
||||
@endcomponent
|
||||
@endslot
|
||||
@endisset
|
||||
|
||||
|
||||
{{-- Footer --}}
|
||||
@slot('footer')
|
||||
@component('mail::footer')
|
||||
© {{ date('Y') }} {{ config('ninja.app_name') }}.
|
||||
@endcomponent
|
||||
@endslot
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
{{ $message }}
|
||||
@endcomponent
|
||||
|
||||
@ -1,40 +1,19 @@
|
||||
@component('mail::layout')
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
|
||||
@endslot
|
||||
|
||||
{{-- Header --}}
|
||||
@slot('header')
|
||||
@component('mail::header', ['url' => config('app.url')])
|
||||
Header Title
|
||||
@endcomponent
|
||||
@endslot
|
||||
{{-- Body --}}
|
||||
{{ $message }}
|
||||
|
||||
{{-- Body --}}
|
||||
{{ $message }}
|
||||
{!! str_replace('\n', '<br>', $system_info) !!}
|
||||
|
||||
{!! str_replace('\n', '<br>', $system_info) !!}
|
||||
|
||||
@if(@count($laravel_log) > 0)
|
||||
<details>
|
||||
@if(@count($laravel_log) > 0)
|
||||
<details>
|
||||
<summary>{{ ctrans('texts.display_log') }}</summary>
|
||||
@foreach($laravel_log as $log_line)
|
||||
<small>{{ $log_line }}</small> <br>
|
||||
@endforeach
|
||||
</details>
|
||||
@endif
|
||||
{{-- Subcopy --}}
|
||||
@isset($subcopy)
|
||||
@slot('subcopy')
|
||||
@component('mail::subcopy')
|
||||
{{ $subcopy }}
|
||||
@endcomponent
|
||||
@endslot
|
||||
@endisset
|
||||
|
||||
|
||||
{{-- Footer --}}
|
||||
@slot('footer')
|
||||
@component('mail::footer')
|
||||
© {{ date('Y') }} {{ config('ninja.app_name') }}.
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
</details>
|
||||
@endif
|
||||
@endcomponent
|
||||
|
||||
@ -22,14 +22,18 @@
|
||||
background-color: var(--primary-color);
|
||||
}
|
||||
|
||||
#email-content h1 {
|
||||
#email-content h1, h2, h3, h4 {
|
||||
display: block;
|
||||
color: {{ $design == 'light' ? 'black' : 'white' }};
|
||||
padding-bottom: 20px;
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
#email-content p {
|
||||
display: block;
|
||||
color: {{ $design == 'light' ? 'black' : 'white' }};
|
||||
padding-bottom: 20px;
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
.button {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user