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

Added email settings page

Browse Source
This commit is contained in:
Hillel Coren 2015-12-15 23:06:42 +02:00
parent 399ad76fc3
commit f4863d3ec0
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Account.php
View File

@ -731,7 +731,7 @@ class Account extends Eloquent
$template = "<div>\$client,</div><br>" . $template = "<div>\$client,</div><br>" .
"<div>" . trans("texts.{$entityType}_message", ['amount' => '$amount']) . "</div><br>" . "<div>" . trans("texts.{$entityType}_message", ['amount' => '$amount']) . "</div><br>" .
"<div><a href=\"\$viewLink\">\$viewLink</a></div><br>"; "<div>\$viewLink</div><br>";
if ($message) { if ($message) {
$template .= "$message<p/>\r\n\r\n"; $template .= "$message<p/>\r\n\r\n";
@ -742,6 +742,8 @@ class Account extends Eloquent
public function getEmailTemplate($entityType, $message = false) public function getEmailTemplate($entityType, $message = false)
{ {
$template = false;
if ($this->isPro()) { if ($this->isPro()) {
$field = "email_template_{$entityType}"; $field = "email_template_{$entityType}";
$template = $this->$field; $template = $this->$field;

1
resources/lang/en/texts.php
View File

@ -977,4 +977,5 @@ return array(
'token_expired' => 'Validation token was expired. Please try again.', 'token_expired' => 'Validation token was expired. Please try again.',
'invoice_link' => 'Invoice Link', 'invoice_link' => 'Invoice Link',
); );

2
resources/views/emails/confirm_html.blade.php
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
</head> </head>
<body> <body>
@if (false && !$invitationMessage) @if (!$invitationMessage)
@include('emails.confirm_action', ['user' => $user]) @include('emails.confirm_action', ['user' => $user])
@endif @endif