diff --git a/app/Listeners/HandleInvoiceSent.php b/app/Listeners/HandleInvoiceSent.php index 35a3a0710..119936e95 100644 --- a/app/Listeners/HandleInvoiceSent.php +++ b/app/Listeners/HandleInvoiceSent.php @@ -29,12 +29,12 @@ class HandleInvoiceSent { public function handle(InvoiceSent $event) { $invoice = $event->invoice; - + foreach ($invoice->account->users as $user) { if ($user->{'notify_sent'}) { - $this->userMailer->sendNotification($user, $invoice, 'sent', $payment); + $this->userMailer->sendNotification($user, $invoice, 'sent'); } } } diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php index 7d2c599d6..98acdc810 100644 --- a/app/Ninja/Mailers/ContactMailer.php +++ b/app/Ninja/Mailers/ContactMailer.php @@ -1,12 +1,10 @@ {{ $invitationMessage . trans('texts.confirmation_message') }}
- - {{ URL::to("user/confirm/{$user->confirmation_code}") }} + + {!! URL::to("user/confirm/{$user->confirmation_code}")!!}

diff --git a/resources/views/emails/confirm_text.blade.php b/resources/views/emails/confirm_text.blade.php index 37ee70f32..652815a1f 100644 --- a/resources/views/emails/confirm_text.blade.php +++ b/resources/views/emails/confirm_text.blade.php @@ -1,7 +1,7 @@ {{ trans('texts.confirmation_header') }} {{ $invitationMessage . trans('texts.confirmation_message') }} -{{ URL::to("user/confirm/{$user->confirmation_code}") }} +{!! URL::to("user/confirm/{$user->confirmation_code}") !!} {{ trans('texts.email_signature') }} {{ trans('texts.email_from') }} \ No newline at end of file diff --git a/resources/views/emails/contact_html.blade.php b/resources/views/emails/contact_html.blade.php index 120f94c0f..76e2e1b75 100644 --- a/resources/views/emails/contact_html.blade.php +++ b/resources/views/emails/contact_html.blade.php @@ -1 +1 @@ -{{ nl2br($text) }} +{!! nl2br($text) !!} diff --git a/resources/views/emails/invoice_html.blade.php b/resources/views/emails/invoice_html.blade.php index 362047cf6..ee184be01 100644 --- a/resources/views/emails/invoice_html.blade.php +++ b/resources/views/emails/invoice_html.blade.php @@ -5,6 +5,6 @@ @include('emails.view_action', ['link' => $link, 'entityType' => $entityType]) - {{ $body }} + {!! $body !!} \ No newline at end of file diff --git a/resources/views/emails/invoice_text.blade.php b/resources/views/emails/invoice_text.blade.php index 022b18abd..9b258c53a 100644 --- a/resources/views/emails/invoice_text.blade.php +++ b/resources/views/emails/invoice_text.blade.php @@ -1 +1 @@ -{{ strip_tags($body) }} \ No newline at end of file +{!! strip_tags($body) !!} \ No newline at end of file diff --git a/resources/views/emails/payment_confirmation_html.blade.php b/resources/views/emails/payment_confirmation_html.blade.php index f96d52c7f..4459df93e 100644 --- a/resources/views/emails/payment_confirmation_html.blade.php +++ b/resources/views/emails/payment_confirmation_html.blade.php @@ -3,5 +3,5 @@ - {{ $body }} + {!! $body !!} diff --git a/resources/views/emails/payment_confirmation_text.blade.php b/resources/views/emails/payment_confirmation_text.blade.php index 022b18abd..9b258c53a 100644 --- a/resources/views/emails/payment_confirmation_text.blade.php +++ b/resources/views/emails/payment_confirmation_text.blade.php @@ -1 +1 @@ -{{ strip_tags($body) }} \ No newline at end of file +{!! strip_tags($body) !!} \ No newline at end of file diff --git a/resources/views/public/header.blade.php b/resources/views/public/header.blade.php index fe71592f4..a7d466a9b 100644 --- a/resources/views/public/header.blade.php +++ b/resources/views/public/header.blade.php @@ -175,13 +175,13 @@ table.table thead .sorting_desc_disabled:after { content: '' !important } @if (!isset($hideHeader) || !$hideHeader)

@endif @@ -213,16 +213,16 @@ table.table thead .sorting_desc_disabled:after { content: '' !important } diff --git a/resources/views/public_list.blade.php b/resources/views/public_list.blade.php index a517539ab..135fdf17c 100644 --- a/resources/views/public_list.blade.php +++ b/resources/views/public_list.blade.php @@ -92,11 +92,11 @@

{{ $title }}

- {{ Datatable::table() + {!! Datatable::table() ->addColumn($columns) ->setUrl(route('api.client.' . $entityType . 's')) ->setOptions('sPaginationType', 'bootstrap') - ->render('datatable') }} + ->render('datatable') !!}