Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #4106 from beganovich/v2-email-footer-whitelabel

Browse Source 
Add whitelabel to e-mail
This commit is contained in:
David Bomba 2020-09-28 20:00:28 +10:00 committed by GitHub
commit 80ecab54af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Utils/TemplateEngine.php
View File

@ -173,6 +173,7 @@ class TemplateEngine
$data['footer'] = '';
$data['signature'] = $this->settings_entity->getSetting('email_signature');
$data['settings'] = $this->settings;
$data['whitelabel'] = $this->entity_obj->client->user->account->isPaid() ? true : false;
if ($email_style == 'custom') {
$wrapper = $this->settings_entity->getSetting('email_style_custom');

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,6 +1,6 @@
{
"/js/app.js": "/js/app.js?id=a33a5a58bfc6e2174841",
"/css/app.css": "/css/app.css?id=6275f3bfb92a11a19a8f",
"/css/app.css": "/css/app.css?id=52628d49061f3dbade45",
"/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=b0f29d5fdfa492962c22",
"/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=d7e708d66a9c769b4c6e",
"/js/clients/payment_methods/authorize-ach.js": "/js/clients/payment_methods/authorize-ach.js?id=260b1515722aadacba1b",

2
resources/views/email/template/dark.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'dark', 'settings' => $settings])
@component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
@slot('header')
@component('email.components.header', ['p' => $body, 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])

2
resources/views/email/template/light.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light', 'settings' => $settings])
@component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
@slot('header')
@component('email.components.header', ['p' => $body, 'logo' => 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])

20
resources/views/email/template/master.blade.php
View File

@ -5,11 +5,11 @@ if(!isset($design)) $design = 'light';
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>@yield('title')</title>
</head>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>@yield('title')</title>
</head>
<style>
:root {
@ -57,6 +57,14 @@ if(!isset($design)) $design = 'light';
</div>
</div>
</body>
<!-- Whitelabel -->
@if(!$whitelabel)
<div style="display: flex; flex-direction: row; justify-content: center; margin-top: 1rem; margin-bottom: 1rem;">
<a href="https://invoiceninja.com" target="_blank">
<img style="height: 4rem;" src="{{ asset('images/created-by-invoiceninja-new.png') }}" alt="Invoice Ninja">
</a>
</div>
@endif
</body>
</html>

19
resources/views/email/template/plain.blade.php
View File

@ -8,16 +8,23 @@
<body class="bg-white p-4">
{!! $body !!}
@if($signature)
<div style="margin-top: 20px">
{!! $signature !!}
</div>
@endif
@if($signature)
<div style="margin-top: 20px">
{!! $signature !!}
</div>
@endif
</body>
<footer class="p-4">
{!! $footer !!}
</footer>
@if(!$whitelabel)
<div style="display: block; margin-top: 1rem; margin-bottom: 1rem;">
<a href="https://invoiceninja.com" target="_blank">
{{ __('texts.ninja_email_footer', ['site' => 'Invoice Ninja']) }}
</a>
</div>
@endif
</html>