From 4cba96d97376a8f61096763c023dad17e49c8c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 11 Jun 2021 15:52:28 +0200 Subject: [PATCH] ACHVerificationNotification: - Pass $company into view - Update view to use client layout - Fixes for client layout / whitelabel handling --- .../Gateways/ACHVerificationNotification.php | 1 + .../ach-verification-notification.blade.php | 2 +- .../views/email/template/client.blade.php | 20 ++++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/Mail/Gateways/ACHVerificationNotification.php b/app/Mail/Gateways/ACHVerificationNotification.php index b15709d638..346181a54e 100644 --- a/app/Mail/Gateways/ACHVerificationNotification.php +++ b/app/Mail/Gateways/ACHVerificationNotification.php @@ -47,6 +47,7 @@ class ACHVerificationNotification extends Mailable ->view('email.gateways.ach-verification-notification', [ 'logo' => $this->company->present()->logo(), 'settings' => $this->company->settings, + 'company' => $this->company, ]); } } diff --git a/resources/views/email/gateways/ach-verification-notification.blade.php b/resources/views/email/gateways/ach-verification-notification.blade.php index d03b3e64f5..1c49dddc0e 100644 --- a/resources/views/email/gateways/ach-verification-notification.blade.php +++ b/resources/views/email/gateways/ach-verification-notification.blade.php @@ -1,4 +1,4 @@ -@component('email.template.admin', ['logo' => $logo, 'settings' => $settings]) +@component('email.template.client', ['logo' => $logo, 'settings' => $settings, 'company' => $company])

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

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

diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php index 34882974eb..f3ae10b440 100644 --- a/resources/views/email/template/client.blade.php +++ b/resources/views/email/template/client.blade.php @@ -111,15 +111,21 @@ -
-
+
+
- {{ $slot }} -
+ {{ $slot}} + +
+ + +
+
- @if(isset($company) & $company instanceof \App\Models\Company) + @if(isset($company) && $company instanceof \App\Models\Company)
© {{ date('Y') }} Invoice Ninja, All Rights Reserved

+ @else +

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

@endif