From f4863d3ec075a434eb74af35f1e2eddb93ab899b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 15 Dec 2015 23:06:42 +0200 Subject: [PATCH] Added email settings page --- app/Models/Account.php | 4 +++- resources/lang/en/texts.php | 1 + resources/views/emails/confirm_html.blade.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index 3150f96a39fd..fc5a21edcf0e 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -731,7 +731,7 @@ class Account extends Eloquent $template = "
\$client,

" . "
" . trans("texts.{$entityType}_message", ['amount' => '$amount']) . "

" . - "
\$viewLink

"; + "
\$viewLink

"; if ($message) { $template .= "$message

\r\n\r\n"; @@ -742,6 +742,8 @@ class Account extends Eloquent public function getEmailTemplate($entityType, $message = false) { + $template = false; + if ($this->isPro()) { $field = "email_template_{$entityType}"; $template = $this->$field; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index e581000b9f30..2b62cad6602f 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -977,4 +977,5 @@ return array( 'token_expired' => 'Validation token was expired. Please try again.', 'invoice_link' => 'Invoice Link', + ); diff --git a/resources/views/emails/confirm_html.blade.php b/resources/views/emails/confirm_html.blade.php index fe4b73a847aa..fefb14c7d90f 100644 --- a/resources/views/emails/confirm_html.blade.php +++ b/resources/views/emails/confirm_html.blade.php @@ -4,7 +4,7 @@ -@if (false && !$invitationMessage) +@if (!$invitationMessage) @include('emails.confirm_action', ['user' => $user]) @endif