Update e-mail templates

Removed fedeisas/laravel-mail-css-inliner

composer.json

@@ -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",

composer.lock

@@ -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",

resources/views/email/auth/password-reset.blade.php

@@ -1,22 +1,19 @@
-@component('email.template.master', ['design' => 'light'])
+@component('email.template.master', ['design' => 'light', 'whitelabel' => false])
 
-@slot('header')
+    @slot('header')
-    @component('email.components.header', ['p' => '', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
+        @include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
-        Hello!
+    @endslot
-    @endcomponent
 
-@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.
+    <a href="{{ $link }}" target="_blank" class="button">
+        Reset Password
+    </a>
 
-@component('email.components.button', ['url' => $link, 'show_link' => true])
+    <p>
-    Reset Password
+        If you’re having trouble clicking the "Reset Password" button, copy and paste the URL below into your web
-@endcomponent
+        browser:
+    </p>
 
-
-@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '&copy; 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

resources/views/email/auth/verify.blade.php

@@ -1,35 +1,12 @@
-@component('mail::layout')
+@component('email.template.master', ['design' => 'light', 'whitelabel' => false])
 
-{{-- Header --}}
+    @slot('header')
-@slot('header')
+        @include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
-@component('mail::header', ['url' => config('app.url')])
+    @endslot
-Header Title
+
+    <p>{{ ctrans('texts.confirmation_message') }}</p>
+
+    <a href="{{ url("/user/confirm/{$user->confirmation_code}") }}" target="_blank" class="button">
+        {{ ctrans('texts.confirm') }}
+    </a>
 @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
-
-@endcomponent

resources/views/email/import/completed.blade.php

@@ -1,82 +1,56 @@
-@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')
+    <h1>Import completed</h1>
-    @component('email.components.header')
+    <p>Hello, here is the output of your recent import job.</p>
-        Import completed
-    @endcomponent
-@endslot
 
-@slot('greeting')
+    @if(isset($clients) && count($clients) >=1)
-	Hello,
+        <h3>Clients Imported: {{ count($clients) }} </h3>
-@endslot
+    @endif
 
-Here is the output of your recent import job. <br><br>
+    @if(isset($errors['clients']) && count($errors['clients']) >=1)
+        <h3>Client Errors</h3>
 
-@if(isset($clients) && count($clients) >=1)
+        <ul>
+            @foreach($errors['clients'] as $error)
+                <li>{{ $error['client'] }} - {{ $error['error'] }}</li>
+            @endforeach
+        </ul>
+    @endif
 
-<h3>Clients Imported: {{ count($clients) }} </h3>
+    @if(isset($invoices) && count($invoices) >=1)
 
-@endif
+        <h3>Invoices Imported: {{ count($invoices) }} </h3>
 
-@if(isset($errors['clients']) && count($errors['clients']) >=1)
+    @endif
 
-    <h3>Client Errors</h3>
+    @if(isset($errors['invoices']) && count($errors['invoices']) >=1)
+        <h3>Invoices Errors</h3>
 
-    <ul>
+        <ul>
-    @foreach($errors['clients'] as $error)
+            @foreach($errors['invoices'] as $error)
-        <li>{{ $error['client'] }} - {{ $error['error'] }}</li>
+                <li>{{ $error['invoice'] }} - {{ $error['error'] }}</li>
-    @endforeach
+            @endforeach
-    </ul>
+        </ul>
-@endif
+    @endif
 
-@if(isset($invoices) && count($invoices) >=1)
+    @if(isset($products) && count($products) >=1)
+        <h3>Products Imported: {{ count($products) }} </h3>
+    @endif
 
-<h3>Invoices Imported: {{ count($invoices) }} </h3>
+    @if(isset($errors['products']) && count($errors['products']) >=1)
+        <h3>Client Errors</h3>
 
-@endif
+        <ul>
+            @foreach($errors['products'] as $error)
+                <li>{{ $error['product'] }} - {{ $error['error'] }}</li>
+            @endforeach
+        </ul>
+    @endif
 
-@if(isset($errors['invoices']) && count($errors['invoices']) >=1)
+    <a href="{{ url('/') }}" target="_blank" class="button">Visit portal</a>
 
-    <h3>Invoices Errors</h3>
+    <p>Thank you, <br/> Invoice Ninja.</p>
-
-    <ul>
-    @foreach($errors['invoices'] as $error)
-        <li>{{ $error['invoice'] }} - {{ $error['error'] }}</li>
-    @endforeach
-    </ul>
-@endif
-
-@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>
-    @foreach($errors['products'] as $error)
-        <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' => '&copy; InvoiceNinja'])
-        For any info, please visit InvoiceNinja.
-    @endcomponent
-@endslot
-
-@endcomponent

resources/views/email/invoices/paid.blade.php

@@ -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')
+    <h1>Payment for your invoice has been completed!</h1>
-    @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'])
+    <p>We want to inform you that payment was completed for your invoice.</p>
-        Invoice paid
-    @endcomponent
 
-@endslot
+    <a href="https://invoiceninja.com" target="_blank" class="button">Visit Invoice Ninja</a>
-
-@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' => '&copy; InvoiceNinja'])
-        For any info, please visit InvoiceNinja.
-    @endcomponent
-@endslot    
-
-@endcomponent

resources/views/email/migration/completed.blade.php

@@ -1,31 +1,13 @@
-@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
+@component('email.template.master', ['design' => 'light', 'settings' => $settings])
 
-@slot('header')
+    @slot('header')
-    @component('email.components.header')
+        @include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
-        Migration completed
+    @endslot
-    @endcomponent
-@endslot
 
-@slot('greeting')
+    <h1>Migration completed</h1>
-	Hello,
+    <p>We're happy to inform you that migration has been completed successfully. It is ready for you to review it.</p>
-@endslot
 
-We're happy to inform you that migration has been completed successfully. It is ready for you to review it.
+    <a href="{{ url('/') }}" target="_blank" class="button">Visit portal</a>
 
-@component('email.components.button', ['url' => url('/')])
+    <p>Thank you, <br/> Invoice Ninja</p>
-    Visit portal
 @endcomponent
-
-
-@slot('signature')
-Thank you, <br>
-Invoice Ninja    
-@endslot
-
-@slot('footer')
-    @component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '&copy; InvoiceNinja'])
-        For any info, please visit InvoiceNinja.
-    @endcomponent
-@endslot
-
-@endcomponent

resources/views/email/migration/existing.blade.php

@@ -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')
@@ -19,7 +19,7 @@ Looks like you already migrated your data to V2 version of the Invoice Ninja. In
 
 @slot('signature')
 Thank you, <br>
-Invoice Ninja    
+Invoice Ninja
 @endslot
 
 @slot('footer')
@@ -28,4 +28,4 @@ Invoice Ninja
     @endcomponent
 @endslot
 
-@endcomponent
+@endcomponent

resources/views/email/migration/failed.blade.php

@@ -1,7 +1,13 @@
-Whoops!
+@component('email.template.master', ['design' => 'light', 'settings' => $settings])
-Looks like your migration failed.
+    @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>
-    {!! $exception->getMessage() !!}
+    <p>Looks like your migration failed. Here's the error message:</p>
-    {!! $content !!}
+
-</pre>
+    <pre>
+        {!! $exception->getMessage() !!}
+        {!! $content !!}
+    </pre>
+@endcomponent

resources/views/email/quotes/approved.blade.php

@@ -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')
+    <h1>Quote approved!</h1>
-    @component('email.components.header', ['p' => 'Your quote was approved!', 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
+    <p>We want to inform you that quote was approved.</p>
-        Quote approved
-    @endcomponent
 
-@endslot
+    <a href="https://invoiceninja.com" target="_blank" class="button">Visit Invoice Ninja</a>
-
-@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' => '&copy; InvoiceNinja'])
-        For any info, please visit InvoiceNinja.
-    @endcomponent
-@endslot    
-
-@endcomponent

resources/views/email/support/cancellation.blade.php

@@ -1,30 +1,7 @@
-@component('mail::layout')
+@component('email.template.master', ['design' => 'light', 'settings' => $settings])
-
+    @slot('header')
-{{-- Header --}}
+        @include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
-@slot('header')
+    @endslot
-@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
 
+    {{ $message }}
 @endcomponent

resources/views/email/support/message.blade.php

@@ -1,40 +1,19 @@
-@component('mail::layout')
+@component('email.template.master', ['design' => 'light', 'settings' => $settings])
-
+    @slot('header')
-{{-- Header --}}
+        @include('email.components.header', ['logo' => 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
-@slot('header')
+    @endslot
-@component('mail::header', ['url' => config('app.url')])
-Header Title
-@endcomponent
-@endslot
-
-{{-- Body --}}
-{{ $message }}
-
-{!! str_replace('\n', '<br>', $system_info) !!}
-
-@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
 
+    {{-- Body --}}
+    {{ $message }}
+
+    {!! str_replace('\n', '<br>', $system_info) !!}
+
+    @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
 @endcomponent

resources/views/email/template/master.blade.php

@@ -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 {