From e2626051dcca4c16d6798082cac7e8f39d72b93b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 3 Sep 2015 10:36:00 +0300 Subject: [PATCH] Removed html escape from text email blade files --- app/Ninja/Mailers/Mailer.php | 1 - resources/views/emails/contact_text.blade.php | 2 +- resources/views/emails/invoice_paid_text.blade.php | 14 +++++++------- resources/views/emails/invoice_sent_text.blade.php | 10 +++++----- .../views/emails/invoice_viewed_text.blade.php | 10 +++++----- .../emails/license_confirmation_text.blade.php | 10 +++++----- .../views/emails/quote_approved_text.blade.php | 10 +++++----- 7 files changed, 28 insertions(+), 29 deletions(-) diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php index fa29f28855..9995a27c4d 100644 --- a/app/Ninja/Mailers/Mailer.php +++ b/app/Ninja/Mailers/Mailer.php @@ -41,7 +41,6 @@ class Mailer return true; } catch (Exception $exception) { if (isset($_ENV['POSTMARK_API_TOKEN'])) { - //dd($exception->getResponse()); $response = $exception->getResponse()->getBody()->getContents(); $response = json_decode($response); return nl2br($response->Message); diff --git a/resources/views/emails/contact_text.blade.php b/resources/views/emails/contact_text.blade.php index 8c1a40ba95..ac4481fb9d 100644 --- a/resources/views/emails/contact_text.blade.php +++ b/resources/views/emails/contact_text.blade.php @@ -1 +1 @@ -{{ $text }} \ No newline at end of file +{!! $text !!} \ No newline at end of file diff --git a/resources/views/emails/invoice_paid_text.blade.php b/resources/views/emails/invoice_paid_text.blade.php index 77f29aed49..f604076c1e 100644 --- a/resources/views/emails/invoice_paid_text.blade.php +++ b/resources/views/emails/invoice_paid_text.blade.php @@ -1,11 +1,11 @@ -{{ trans('texts.email_salutation', ['name' => $userName]) }} +{!! trans('texts.email_salutation', ['name' => $userName]) !!} -{{ trans("texts.notification_{$entityType}_paid", ['amount' => $paymentAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} +{!! trans("texts.notification_{$entityType}_paid", ['amount' => $paymentAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) !!} -{{ trans("texts.{$entityType}_link_message") }} -{{ $invoiceLink }} +{!! trans("texts.{$entityType}_link_message") !!} +{!! $invoiceLink !!} -{{ trans('texts.email_signature') }} -{{ trans('texts.email_from') }} +{!! trans('texts.email_signature') !!} +{!! trans('texts.email_from') !!} -{{ trans('texts.user_email_footer') }} \ No newline at end of file +{!! trans('texts.user_email_footer') !!} \ No newline at end of file diff --git a/resources/views/emails/invoice_sent_text.blade.php b/resources/views/emails/invoice_sent_text.blade.php index 72a5950780..caea95dd1f 100644 --- a/resources/views/emails/invoice_sent_text.blade.php +++ b/resources/views/emails/invoice_sent_text.blade.php @@ -1,8 +1,8 @@ -{{ trans('texts.email_salutation', ['name' => $userName]) }} +{!! trans('texts.email_salutation', ['name' => $userName]) !!} -{{ trans("texts.notification_{$entityType}_sent", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} +{!! trans("texts.notification_{$entityType}_sent", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) !!} -{{ trans('texts.email_signature') }} -{{ trans('texts.email_from') }} +{!! trans('texts.email_signature') !!} +{!! trans('texts.email_from') !!} -{{ trans('texts.user_email_footer') }} \ No newline at end of file +{!! trans('texts.user_email_footer') !!} \ No newline at end of file diff --git a/resources/views/emails/invoice_viewed_text.blade.php b/resources/views/emails/invoice_viewed_text.blade.php index 7b9dadd21c..1de6bd5049 100644 --- a/resources/views/emails/invoice_viewed_text.blade.php +++ b/resources/views/emails/invoice_viewed_text.blade.php @@ -1,8 +1,8 @@ -{{ trans('texts.email_salutation', ['name' => $userName]) }} +{!! trans('texts.email_salutation', ['name' => $userName]) !!} -{{ trans("texts.notification_{$entityType}_viewed", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} +{!! trans("texts.notification_{$entityType}_viewed", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) !!} -{{ trans('texts.email_signature') }} -{{ trans('texts.email_from') }} +{!! trans('texts.email_signature') !!} +{!! trans('texts.email_from') !!} -{{ trans('texts.user_email_footer') }} \ No newline at end of file +{!! trans('texts.user_email_footer') !!} \ No newline at end of file diff --git a/resources/views/emails/license_confirmation_text.blade.php b/resources/views/emails/license_confirmation_text.blade.php index d8ee711c9a..0f35bb3d66 100644 --- a/resources/views/emails/license_confirmation_text.blade.php +++ b/resources/views/emails/license_confirmation_text.blade.php @@ -1,8 +1,8 @@ -{{ $client }}, +{!! $client !!}, -{{ trans('texts.payment_message', ['amount' => $amount]) }} +{!! trans('texts.payment_message', ['amount' => $amount]) !!} -{{ $license }} +{!! $license !!} -{{ trans('texts.email_signature') }} -{{ $account }} \ No newline at end of file +{!! trans('texts.email_signature') !!} +{!! $account !!} \ No newline at end of file diff --git a/resources/views/emails/quote_approved_text.blade.php b/resources/views/emails/quote_approved_text.blade.php index 826b18e7d5..7ae4689362 100644 --- a/resources/views/emails/quote_approved_text.blade.php +++ b/resources/views/emails/quote_approved_text.blade.php @@ -1,8 +1,8 @@ -{{ trans('texts.email_salutation', ['name' => $userName]) }} +{!! trans('texts.email_salutation', ['name' => $userName]) !!} -{{ trans("texts.notification_{$entityType}_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) }} +{!! trans("texts.notification_{$entityType}_approved", ['amount' => $invoiceAmount, 'client' => $clientName, 'invoice' => $invoiceNumber]) !!} -{{ trans('texts.email_signature') }} -{{ trans('texts.email_from') }} +{!! trans('texts.email_signature') !!} +{!! trans('texts.email_from') !!} -{{ trans('texts.user_email_footer') }} \ No newline at end of file +{!! trans('texts.user_email_footer') !!} \ No newline at end of file